Browse Source

扫码入库添加新字段

yzc 1 year ago
parent
commit
81358537d4

+ 7 - 0
hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDetailsDto.java

@@ -4,6 +4,8 @@ import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
+import java.util.List;
+
 /**
 /**
  * 待出入库明细新增编辑入参实体
  * 待出入库明细新增编辑入参实体
  *
  *
@@ -41,4 +43,9 @@ public class StockWaitDetailsDto extends StockWaitDetails {
      * 接收人
      * 接收人
      */
      */
     private String receivingPerson;
     private String receivingPerson;
+
+    /**
+     * 扫码ids(采购明细id列表)
+     */
+    private List<Long> scanIds;
 }
 }

+ 4 - 0
hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWaitDetails.java

@@ -60,4 +60,8 @@ public class StockWaitDetails extends BasePo {
      */
      */
     private Integer status;
     private Integer status;
 
 
+    /**
+     * 采购明细id
+     */
+    private Long purchaseDetailId;
 }
 }

+ 1 - 0
hx-wms/src/main/resources/mapper/stock/StockWaitDetailsMapper.xml

@@ -17,6 +17,7 @@
             swd.update_user,
             swd.update_user,
             swd.update_time,
             swd.update_time,
             swd.victoriatourist_json,
             swd.victoriatourist_json,
+            swd.purchase_detail_id,
             if(sw.business_type =2,(SELECT ptd.product_sn from bytesailing_mes.production_task_detail ptd where ptd.id=sw.business_id),'') as productSn,
             if(sw.business_type =2,(SELECT ptd.product_sn from bytesailing_mes.production_task_detail ptd where ptd.id=sw.business_id),'') as productSn,
             IF( sw.business_type = 2,( SELECT sc.customer_id FROM bytesailing_jxst.sales_contract sc
             IF( sw.business_type = 2,( SELECT sc.customer_id FROM bytesailing_jxst.sales_contract sc
                 LEFT JOIN bytesailing_mes.work_order wo ON wo.source_id = sc.id AND wo.del_flag = 0
                 LEFT JOIN bytesailing_mes.work_order wo ON wo.source_id = sc.id AND wo.del_flag = 0