- 理货备货/分拣出库：分拣查询规格数据来源变更;(待测试)

warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/vo/InvLotLocIdLotattVO.java

@@ -12,7 +12,7 @@ public class InvLotLocIdLotattVO {
     private String sku;
     private String skuName;
     private String skuTypeName;
-    private String skuSpecs;
+    private String skuModel;
     private String locationNo;
     private String zoneId;
     private String stockStatus;
@@ -281,12 +281,12 @@ public class InvLotLocIdLotattVO {
         this.zoneName = zoneName;
     }
 
-    public String getSkuSpecs() {
-        return skuSpecs;
+    public String getSkuModel() {
+        return skuModel;
     }
 
-    public void setSkuSpecs(String skuSpecs) {
-        this.skuSpecs = skuSpecs;
+    public void setSkuModel(String skuModel) {
+        this.skuModel = skuModel;
     }
 
     public String getStockStatus() {

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -613,7 +613,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                 pickingListVO.setPickQty(BigDecimal.ZERO.doubleValue());
                 pickingListVO.setToBePickQty(locIdLotattVO.getQty());
                 pickingListVO.setBarcode(locIdLotattVO.getLotatt02());
-                pickingListVO.setSpecs(locIdLotattVO.getSkuSpecs());
+                pickingListVO.setModel(locIdLotattVO.getSkuModel());
                 pickingListVOS.add(pickingListVO);
             }
         }

warewms-ams/src/main/java/com/ruoyi/ams/order/vo/PickingListVO.java

@@ -9,5 +9,5 @@ public class PickingListVO {
     private Double pickQty;
     private Double toBePickQty;
     private String barcode;//条码
-    private String specs;//规格
+    private String model;//规格
 }

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sku"    column="sku"    />
         <result property="skuName"    column="sku_name"    />
         <result property="skuTypeName"    column="sku_type_name"    />
-        <result property="skuSpecs"    column="sku_specs"    />
+        <result property="skuModel"    column="sku_model"    />
         <result property="qty"    column="qty"    />
         <result property="qtyallocated"    column="qtyallocated"    />
         <result property="palletNo"    column="box_no"    />
@@ -332,7 +332,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectInvLocIdLotattList" resultMap="InvLotLocIdLotattResult">
         select
-        inv.location_id,sk.sku,sk.desc1 sku_name,skt.specs sku_specs,skt.item_name sku_type_name,b.location_no,inv.qty,inv.qtyallocated
+        inv.location_id,sk.sku,sk.desc1 sku_name,skt.model sku_model,skt.item_name sku_type_name,b.location_no,inv.qty,inv.qtyallocated
         ,att.lotnum, att.customer_id,w.box_no,w.is_full
         b.zone_id,b.stock_status stockStatus,b.is_empty isEmpty,z.zone_name
         ,lotatt01, lotatt02, lotatt03, lotatt04,lot05_dict.dict_label lotatt05, supp.supplier_name lotatt06