1、零部件出库单测试完毕

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java

@@ -101,9 +101,9 @@ public class ComponentOutboundController {
     }
 
     /**
-     * 出库单详情列表
+     * 扫码记录
      *
-     * @param itemId 出库单详情ID，不能为空
+     * @param itemId
      * @return 扫码信息
      */
     @GetMapping("getscancodes")
@@ -144,6 +144,7 @@ public class ComponentOutboundController {
         ZWM3A20DTO zwm3a20DTO = new ZWM3A20DTO()
                 .setItSernrPatch(new ArrayList<>())
                 .setItem(new ArrayList<>())
+                .setItSernr(new ArrayList<>())
                 .setItSernrPatch(new ArrayList<>())
                 .setIType("A")
                 .setIvDelivery(packing.getVbeln());
@@ -206,7 +207,7 @@ public class ComponentOutboundController {
                     outboundScanCodes.add(scanCodes);
                     //组装下库存信息
                     setInventoryDTO(inventories, outboundItem.getIdnrk(),
-                            packing.getFactoryNo(), outboundItem.getLgort(), code.getSerialNumber(), code.getCodeNum());
+                            packing.getFactoryNo(), outboundItem.getLgort(), code.getBatchNumber(), code.getCodeNum());
 
                 }
 

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentOutboundControllerService.java

@@ -59,9 +59,6 @@ public class ComponentOutboundControllerService {
             wmsComponentOutboundItemService.saveBatch(outboundItems);
         }
 
-        if (CollectionUtil.isNotEmpty(outboundScanCodes)) {
-            wmsComponentOutboundScanCodesService.insert(outboundScanCodes);
-        }
 
         if (CollectionUtil.isNotEmpty(inventories)) {
             inventoryService.out(inventories);
@@ -79,5 +76,10 @@ public class ComponentOutboundControllerService {
                 .set(WmsComponentOutbound::getMaterialDocYear, result.getValue())
                 .eq(WmsComponentOutbound::getId, outbound.getId())
                 .update();
+
+
+        if (CollectionUtil.isNotEmpty(outboundScanCodes)) {
+            wmsComponentOutboundScanCodesService.insert(outboundScanCodes);
+        }
     }
 }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java

@@ -1216,7 +1216,7 @@ public class SapService {
         if (CollectionUtil.isNotEmpty(dto.getItSernrPatch())) {
             tables.put("IT_SERNR_PATCH", JCoUtil.toMapList(dto.getItSernrPatch()));
         }
-
+        log.info("输入表数据: {}", JSONUtil.toJsonStr(tables));
         JCoFunction function = exec("ZWM3A20", parameters, tables);
 
         JCoStructure structure = function.getExportParameterList().getStructure("OUTPUT");

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMOrderReceiveDTO.java

@@ -3,6 +3,7 @@ package com.nflg.wms.common.pojo.dto;
 import com.nflg.wms.common.pojo.qo.SRMOrderReceiveItemQO;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -31,7 +32,7 @@ public class SRMOrderReceiveDTO {
     /**
      * 发货时间
      */
-    private String deliveryNoteDate;
+    private LocalDateTime deliveryNoteDate;
 
     /**
      * 运单号

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingEditInputQO.java

@@ -3,6 +3,7 @@ package com.nflg.wms.common.pojo.qo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingInputQO.java

@@ -3,6 +3,7 @@ package com.nflg.wms.common.pojo.qo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiptQO.java

@@ -53,6 +53,8 @@ public class QCReceiptQO extends SearchBaseQO {
         return receiveEndDate == null ? null : receiveEndDate.plusDays(1);
     }
 
+
+
     /**
      * 入库单号
      */

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java

@@ -32,4 +32,14 @@ public class ComponentPackingPdaVO {
      * 交货单号
      */
     private String vbelv;
+
+    /**
+     * 设备编号
+     */
+   private String matnr;
+
+   /**
+     * 设备名称
+     */
+   private String maktx;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingVO.java

@@ -3,6 +3,7 @@ package com.nflg.wms.common.pojo.vo;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -45,7 +46,7 @@ public class ComponentPackingVO {
     /**
      * 发货日期
      */
-    private LocalDateTime datum;
+    private LocalDate datum;
 
     /**
      * 箱号

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java

@@ -9,6 +9,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrder.java

@@ -74,7 +74,7 @@ public class WmsSrmOrder implements Serializable {
     /**
      * 发货日期
      */
-    private String deliveryNoteDate;
+    private LocalDateTime deliveryNoteDate;
 
     /**
      * 是否已完结

nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml

@@ -4,7 +4,8 @@
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.ComponentOutboundVO">
         select id,packing_no,
-        outbound_no,matnr,name1,uname,vbeln,maktx,datum,xnum,cnum,bname,zjshz,zchep,tel_number,sernr,huodh,vbelv,p_name,l_bezei,l_name,g_streen,g_str_suppl2,wbstk,is_completed,create_name,create_time,factory_no
+        outbound_no,matnr,name1,uname,vbeln,maktx,datum,xnum,cnum,bname,zjshz,zchep,tel_number,sernr,huodh,vbelv,
+        p_name,l_bezei,l_name,g_streen,g_str_suppl2,wbstk,is_completed,create_name,create_time,factory_no
         from wms_component_outbound
         <where>
             <if test="request.packingNo !=null and request.packingNo !=''">
@@ -14,19 +15,19 @@
                 and name1 like concat('%', #{request.name1}, '%')
             </if>
             <if test="request.pName !=null and request.pName !=''">
-                and pName like concat('%', #{request.pName}, '%')
+                and p_name like concat('%', #{request.pName}, '%')
             </if>
             <if test="request.factoryNo !=null and request.factoryNo !=''">
-                and factoryNo = #{request.factoryNo}
+                and factory_no = #{request.factoryNo}
             </if>
             <if test="request.huodh !=null and request.huodh !=''">
-                and huodh like concat('%', #{request.huodh}, '%')
+                and vbelv like concat('%', #{request.huodh}, '%')
             </if>
             <if test="request.vbeln !=null and request.vbeln !=''">
                 and vbeln like concat('%', #{request.vbeln}, '%')
             </if>
             <if test="request.outboundNo !=null and request.outboundNo !=''">
-                and huodh like concat('%', #{request.outboundNo}, '%')
+                and outbound_no like concat('%', #{request.outboundNo}, '%')
             </if>
             <if test="request.startDate !=null">
                 and datum >= #{request.startDate}

nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.nflg.wms.repository.mapper.WmsComponentPackingMapper">
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.ComponentPackingVO">
         select
-        id,no,matnr,name1,uname,vbeln,maktx,datum,xnum,cnum,bname,zjshz,zchep,tel_number,sernr,huodh,vbelv,p_name,l_bezei,l_name,g_streen,g_str_suppl2,wbstk,is_completed,create_name,create_time,factory_no
+        id,no,matnr,name1,uname,vbeln,maktx,datum,xnum,cnum,bname,zjshz,zchep,tel_number,sernr,huodh,vbelv,p_name,
+        l_bezei,l_name,g_streen,g_str_suppl2,wbstk,is_completed,create_name,create_time,factory_no
         from wms_component_packing
         <where>
             <if test="request.no !=null and request.no !=''">
@@ -13,13 +14,13 @@
                 and name1 like concat('%', #{request.name1}, '%')
             </if>
             <if test="request.pName !=null and request.pName !=''">
-                and pName like concat('%', #{request.pName}, '%')
+                and p_name like concat('%', #{request.pName}, '%')
             </if>
             <if test="request.factoryNo !=null and request.factoryNo !=''">
-                and factoryNo = #{request.factoryNo}
+                and factory_no = #{request.factoryNo}
             </if>
             <if test="request.huodh !=null and request.huodh !=''">
-                and huodh like concat('%', #{request.huodh}, '%')
+                and vbelv like concat('%', #{request.huodh}, '%')
             </if>
             <if test="request.vbeln !=null and request.vbeln !=''">
                 and vbeln like concat('%', #{request.vbeln}, '%')
@@ -36,7 +37,7 @@
 
     <select id="getOutboundTask" resultType="com.nflg.wms.common.pojo.vo.ComponentPackingPdaVO">
         select
-        id,no,vbeln,create_time,datum,vbelv
+        id,no,vbeln,create_time,datum,vbelv,matnr,maktx
         from wms_component_packing
         where is_completed=0
         <if test="no !=null and no !=''">

nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml

@@ -28,6 +28,10 @@
             <if test="request.supplierNum !=null and request.supplierNum !=''">
                 and b.supplier_num = #{request.supplierNum}
             </if>
+            <if test="request.poNumber !=null and request.poNumber !='' ">
+                and EXISTS (SELECT 1 FROM wms_po_receipt_item WHERE wms_po_receipt_item.receive_id = a.id and
+                wms_po_receipt_item.po_num like concat('%', #{request.poNumber}, '%'))
+            </if>
             <if test="request.receiveStartDate !=null">
                 and a.create_time >= #{request.receiveStartDate}
             </if>

nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml

@@ -47,12 +47,17 @@
             <if test="request.supplierNum !=null and request.supplierNum !=''">
                 and b.supplier_num =#{request.supplierNum}
             </if>
+            <if test="request.poNumber !=null and request.poNumber !='' ">
+                and EXISTS (SELECT 1 FROM wms_qc_receive_item WHERE wms_qc_receive_item.receive_id = a.id and
+                wms_qc_receive_item.po_num like concat('%', #{request.poNumber}, '%'))
+            </if>
             <if test="request.receiveStartDate !=null">
                 and a.create_time >= #{request.receiveStartDate}
             </if>
             <if test="request.receiveEndDate !=null">
                 and a.create_time &lt; #{request.receiveEndDate}
             </if>
+
             <if test="request.deliveryStartDate !=null">
                 and b.delivery_note_date >= #{request.deliveryStartDate}
             </if>