完善上架单初始化

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java

@@ -157,7 +157,7 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
                     );
             //业务类型
             if (StringUtils.isNotBlank(query.getBusTypeKey())) {
-                qw.eq("wab.busTypeKey", query.getBusTypeKey());
+                qw.eq("wab.busTypeValue", query.getBusTypeKey());
             }
             //供应商
             if (StringUtils.isNotBlank(query.getSupplierName())) {
@@ -169,7 +169,20 @@ public class WmsAnsBillService extends MybatisBaseService<WmsAnsBillMapper, WmsA
                     );
             //单据状态
             if (StringUtils.isNotBlank(query.getBillState())) {
-                qw.like("wab.billState", query.getBillState());
+                String type = "";
+                if (query.getBillState().equals("在途")) {
+                    type = "0";
+                }
+                if (query.getBillState().equals("部分收货")) {
+                    type = "1";
+                }
+                if (query.getBillState().equals("已收货")) {
+                    type = "2";
+                }
+                if (query.getBillState().equals("已取消")) {
+                    type = "3";
+                }
+                qw.eq("wab.billState", type);
             }
 
             //审核状态

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@@ -317,19 +317,8 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo());
         wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid());
         wmsReceiptBillVo.setCreateTime(DateUtil.today());
-        if (wmsAnsBill.getBillState() == 0) {
+        wmsReceiptBillVo.setBillState("新建");
         wmsReceiptBillVo.setBillStateKey("0");
-            wmsReceiptBillVo.setBillState("在途");
-        } else if (wmsAnsBill.getBillState() == 1) {
-            wmsReceiptBillVo.setBillState("部分收货");
-            wmsReceiptBillVo.setBillStateKey("1");
-        } else if (wmsAnsBill.getBillState() == 2) {
-            wmsReceiptBillVo.setBillState("已收货");
-            wmsReceiptBillVo.setBillStateKey("2");
-        } else if (wmsAnsBill.getBillState() == 3) {
-            wmsReceiptBillVo.setBillState("已取消");
-            wmsReceiptBillVo.setBillStateKey("3");
-        }
         List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {