- 理货备货/分拣出库：分拣查询新增条码和规格;(待测试)

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

@@ -12,6 +12,7 @@ public class InvLotLocIdLotattVO {
     private String sku;
     private String skuName;
     private String skuTypeName;
+    private String skuSpecs;
     private String locationNo;
     private String zoneName;
     private Double qty;
@@ -276,4 +277,12 @@ public class InvLotLocIdLotattVO {
     public void setZoneName(String zoneName) {
         this.zoneName = zoneName;
     }
+
+    public String getSkuSpecs() {
+        return skuSpecs;
+    }
+
+    public void setSkuSpecs(String skuSpecs) {
+        this.skuSpecs = skuSpecs;
+    }
 }

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

@@ -1,7 +1,5 @@
 package com.ruoyi.ams.order.service.impl;
 
-import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
-import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.mapper.WmsBoxInfoMapper;
 import com.ruoyi.ams.box.service.IWmsBoxInfoService;
@@ -614,6 +612,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                 pickingListVO.setSku(locIdLotattVO.getSku());
                 pickingListVO.setPickQty(BigDecimal.ZERO.doubleValue());
                 pickingListVO.setToBePickQty(locIdLotattVO.getQty());
+                pickingListVO.setBarcode(locIdLotattVO.getLotatt02());
+                pickingListVO.setSpecs(locIdLotattVO.getSkuSpecs());
                 pickingListVOS.add(pickingListVO);
             }
         }

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

@@ -8,4 +8,6 @@ public class PickingListVO {
     private String sku;
     private Double pickQty;
     private Double toBePickQty;
+    private String barcode;//条码
+    private String specs;//规格
 }

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

@@ -36,6 +36,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="qty"    column="qty"    />
         <result property="qtyallocated"    column="qtyallocated"    />
         <result property="palletNo"    column="box_no"    />
@@ -328,7 +329,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.item_name sku_type_name,b.location_no,inv.qty,inv.qtyallocated
+        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
         ,att.lotnum, att.customer_id,w.box_no,w.is_full,z.zone_name
         ,lotatt01, lotatt02, lotatt03, lotatt04,lot05_dict.dict_label lotatt05, supp.supplier_name lotatt06
         ,lotatt07, lotatt08, lotatt09, lotatt10, lotatt11, lotatt12, lotatt13, lotatt14, lotatt15, lotatt16, lotatt17