pda条码检测返回产品名称和是否产品

warewms-ams/src/main/java/com/ruoyi/ams/order/domain/ActAllocationDetails.java

@@ -31,6 +31,8 @@ public class ActAllocationDetails extends BaseEntity
     @Excel(name = "物料")
     private String material;
 
+    private String skuName;
+
     /** 待检库位 */
     @Excel(name = "待检库位")
     private Long locationId;
@@ -139,6 +141,14 @@ public class ActAllocationDetails extends BaseEntity
         this.locationId = locationId;
     }
 
+    public String getSkuName() {
+        return skuName;
+    }
+
+    public void setSkuName(String skuName) {
+        this.skuName = skuName;
+    }
+
     public Long getLocationId()
     {
         return locationId;

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

@@ -1128,8 +1128,10 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         if (actAllocationDetailsFrom != null) {
             codeSkuRelationshipSoVO.setOrderNo(actAllocationDetailsFrom.getOrderNo());
             codeSkuRelationshipSoVO.setSku(actAllocationDetailsFrom.getMaterial());
+            codeSkuRelationshipSoVO.setSkuName(actAllocationDetailsFrom.getSkuName());
             codeSkuRelationshipSoVO.setSkuType(codeSkuRelationshipVO.getSkuType());
             codeSkuRelationshipSoVO.setSn(actAllocationDetailsFrom.getLotatt02());
+            codeSkuRelationshipSoVO.setProduct(codeSkuRelationshipSoVO.isProduct());
             BigDecimal qty = actAllocationDetailsFrom.getQty().subtract(actAllocationDetailsFrom.getPickQty());
             codeSkuRelationshipSoVO.setQty(qty.doubleValue());
         }

warewms-ams/src/main/resources/mapper/docOrder/ActAllocationDetailsMapper.xml

@@ -50,6 +50,7 @@
         <result property="orderNo" column="order_no"/>
         <result property="lineNo" column="line_no"/>
         <result property="material" column="material"/>
+        <result property="skuName" column="skuName"/>
         <result property="locationId" column="location_id"/>
         <result property="callTransactionId" column="call_transaction_id"/>
         <result property="status" column="status"/>
@@ -133,12 +134,13 @@
     </select>
 
     <select id="selectActAllocationDetailsInvLotAttList" parameterType="object" resultMap="ActAllocationDetailsInvLotAttResult">
-        select t1.*
+        select t1.*,t3.desc1 skuName
         ,t2.lotatt01,t2.lotatt02,t2.lotatt03,t2.lotatt04,t2.lotatt05,t2.lotatt06
         ,t2.lotatt07,t2.lotatt08,t2.lotatt09,t2.lotatt10,t2.lotatt11,t2.lotatt12
         ,t2.lotatt13,t2.lotatt14,t2.lotatt15,t2.lotatt16,t2.lotatt17,t2.lotatt18
         from act_allocation_details t1
         left join inv_lot_att t2 ON t2.lotnum = t1.lotnum
+        left join base_sku t3 on t3.sku = t1.material and t3.customer_id = t3.customer_id
         <where>
             <if test="allocationId != null  and allocationId != ''"> and allocation_id = #{allocationId}</if>
             <if test="locationId != null  and locationId != ''"> and location_id = #{locationId}</if>

warewms-base/src/main/java/com/ruoyi/base/domain/vo/CodeSkuRelationshipSoVO.java

@@ -13,6 +13,9 @@ public class CodeSkuRelationshipSoVO {
     private String orderNo;
     private String sn;
     private String sku;
+    private String skuName;
     private String skuType;
     private Double qty;
+    private boolean isProduct;
+
 }

warewms-base/src/main/java/com/ruoyi/base/domain/vo/CodeSkuRelationshipVO.java

@@ -1,6 +1,5 @@
 package com.ruoyi.base.domain.vo;
 
-import com.ruoyi.base.domain.BaseSku;
 import lombok.Data;
 
 /**
@@ -19,4 +18,4 @@ public class CodeSkuRelationshipVO {
     private String model;
     private boolean isProduct;
     private Double receivedQty;
-}
+}