销售开单选择商品

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml

@@ -103,7 +103,7 @@
         SELECT
         i.sid inventorySid,
         s.price,
-        i.goodSpuSid,
+        i.goodsSpuSid,
         i.goodsSkuSid,
         i.goodsSpuName,
         i.goodsSkuCode,

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java

@@ -14,7 +14,7 @@ public class SmsWmsInventorySalesVo implements Vo {
 
 
     //商品sid
-    private String goodSpuSid;
+    private String goodsSpuSid;
     private String goodsSkuSid;
     //商品名称
     private String goodsSpuName;

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@@ -50,6 +50,14 @@ public class WmsInventoryRest {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("配件库存查询")
+    @PostMapping("/fittingsInventory2")
+    public ResultBean<PagerVo<FittingsInventoryVo>> fittingsInventory2(@RequestBody PagerQuery<FittingsInventoryQuery> pq) {
+        ResultBean<PagerVo<FittingsInventoryVo>> rb = ResultBean.fireFail();
+        PagerVo<FittingsInventoryVo> pv = wmsInventoryService.fittingsInventory(pq);
+        return rb.success().setData(pv);
+    }
+
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WmsInventoryVo>> listPage(@RequestBody PagerQuery<WmsInventoryQuery> pq) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java

@@ -11,6 +11,8 @@ import lombok.Data;
 @Data
 public class FittingsInventoryQuery implements Query {
 
+    private String name;
+    private String menuSid;
     /**
      * 供应商
      */

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -626,37 +626,40 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         privilegeQuery.setOrgPath(query.getOrgPath());
         privilegeQuery.setMenuUrl(query.getMenuUrl());
         privilegeQuery.setUserSid(query.getUserSid());
+        privilegeQuery.setMenuSid(query.getMenuSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-            String orgSidPath = query.getOrgPath();
-            orgSidPath = orgSidPath + "/";
-            int i1 = orgSidPath.indexOf("/");
-            int i2 = orgSidPath.indexOf("/", i1 + 1);
-            int i3 = orgSidPath.indexOf("/", i2 + 1);
-            int i4 = orgSidPath.indexOf("/", i3 + 1);
-            String orgLevelKey = defaultIdReltBean.getData();
-            if ("1".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("a.orgSidPath", orgSidPath);
-            } else if ("2".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("a.orgSidPath", orgSidPath);
-            } else if ("3".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("a.orgSidPath", orgSidPath);
-            } else if ("4".equals(orgLevelKey)) {
-                orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("a.orgSidPath", orgSidPath);
-            } else if ("5".equals(orgLevelKey)) {
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("a.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("a.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("a.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("a.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
 //                qw.eq("wsb.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<FittingsInventoryVo> p = new PagerVo<>();
+                    return p;
+                }
             } else {
                 PagerVo<FittingsInventoryVo> p = new PagerVo<>();
                 return p;
             }
-        } else {
-            PagerVo<FittingsInventoryVo> p = new PagerVo<>();
-            return p;
         }
         //ToDo:添加查询条件
         if (StringUtils.isNotBlank(query.getBillObjName())) {
@@ -680,6 +683,16 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
             qw.like("a.warehouseName", query.getWarehouseName());
         }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("a.billObjName", query.getName())
+                    .or().like("a.deptName", query.getName())
+                    .or().like("a.goodsSkuCode", query.getName())
+                    .or().like("a.goodsSpuName", query.getName())
+                    .or().like("a.manufacturerName", query.getName())
+                    .or().like("a.useOrgName", query.getName())
+                    .or().like("a.warehouseName", query.getName())
+            );
+        }
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<FittingsInventoryVo> pagging = baseMapper.fittingsInventory(page, qw);
         PagerVo<FittingsInventoryVo> p = PagerUtil.pageToVo(pagging, null);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListQuery.java

@@ -35,4 +35,7 @@ public class WmsOldInventoryPageListQuery implements Query {
     private String createBySid;
 
     private String orgPath;
+    private String menuUrl;
+    private String userSid;
+    private String sourceBillNo;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListVo.java

@@ -42,4 +42,6 @@ public class WmsOldInventoryPageListVo {
 
     //库存数量
     private String inventoryCount;
+    private String sourceBillNo; //维修单号
+    private String warehouseInfo; //仓库-库区
 }