Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java

@@ -88,6 +88,10 @@ public interface WmsProductPutMapper {
 
     void updateProOrderWorkorderBatchPallet(@Param("palletCode")String sn);
 
+    void updateWmsProductStatus(WmsProductPut wmsProductPut2);
+
+    List<WmsProductPut> selectWmsProductPutSAPByIds(String productOrder);
+
 //    String selectProOrderWorkorder(WmsProductPut wmsProductPut1);
 
 

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -64,6 +64,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
     private WmsSellOutEmbryoMapper wmsSellOutEmbryoMapper;
     @Autowired
     private WmsRuturnPutEmbryoMapper wmsRuturnPutEmbryoMapper;
+    @Autowired
+    private BaseWarehouseMapper baseWarehouseMapper;
 
     /**
      * 查询成品生产入库
@@ -280,15 +282,16 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 wmsProductPut) {
             WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId());
             if (wmsProductPutSAPById != null) {
-                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByProDuct(wmsProductPutSAPById.getProductOrder());
+                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getProductOrder());
                 if (wmsProductPut2.size() > 0) {
                     List<Map<String, Object>> mapList = new ArrayList<>();
                     Map<String, Object> map = new HashMap<>();
                     for (WmsProductPut wmsProductPut3 :
                             wmsProductPut2) {
+                        String lgort = baseWarehouseMapper.selectByCode(wmsProductPut3.getWhCode());
                         map.put("AUFNR", wmsProductPut3.getProductOrder());
                         map.put("WERKS", wmsProductPut3.getFactoryCode());
-                        map.put("LGORT", wmsProductPut3.getWhCode());
+                        map.put("LGORT", lgort);
                         map.put("QUANTITY", wmsProductPut3.getPutQuantity());
                         map.put("ERFME", wmsProductPut3.getUnitOfMeasure());
                         map.put("BATCH", wmsProductPut3.getAttr4());
@@ -1152,18 +1155,19 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
            WmsProductPut    wmsProductPut2=    wmsProductPutLists.get(0);
            BigDecimal planQuantity=    wmsProductPut2.getPlanQuantity();
            BigDecimal putQuantity=     wmsProductPut2.getPutQuantity();
-           if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){
-               wmsProductPutk.setStatus("1");
-           }else {
-               wmsProductPutk.setStatus("2");
-           }
+//           if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){
+//               wmsProductPutk.setStatus("1");
+//           }else {
+//               wmsProductPutk.setStatus("2");
+//           }
            BigDecimal putQuantityT=putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量
            wmsProductPut2.setPutQuantity(putQuantityT);
            wmsProductPut2.setUpdateTime(new Date());
            wmsProductPut2.setUpdateBy(wmsProductPut.getCreateBy());
            wmsProductPutMapper.updateWmsProductPut(wmsProductPut2);
+           wmsProductPutMapper.updateWmsProductStatus(wmsProductPut2);//修改订单
        }else {
-           wmsProductPutk.setStatus("2");
+           wmsProductPutk.setStatus("2");//
            wmsProductPutk.setSapStatus("0");
            wmsProductPutk.setAttr3(formattedDate);//
            if (wmsProductPutk.getBatchNumber().length()==24){

op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml

@@ -53,7 +53,8 @@
             <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
             <if test="storageType != null  and storageType != ''">and storage_type = #{storageType}</if>
             <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>
-            <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
+            <if test="productCode != null  and productCode != ''">and product_code    like concat('%', #{productCode},
+                '%') </if>
             <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
                 '%')
             </if>
@@ -82,6 +83,7 @@
             <if test="sapFactoryCode != null  and sapFactoryCode != ''">and sap_factory_code = #{sapFactoryCode}</if>
             <if test="wlName != null  and wlName != ''">and wl_name like concat('%', #{wlName}, '%')</if>
         </where>
+        ORDER BY	gmt_create	DESC
     </select>
 
     <select id="selectWmsFpStorageNewsByStorageId" parameterType="String" resultMap="WmsFpStorageNewsResult">

op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml

@@ -294,7 +294,6 @@
 			wms_product_put
 				LEFT JOIN pro_order_workorder ON pro_order_workorder.order_code=wms_product_put.product_order
 		WHERE	 wms_product_put.id = #{id}
-		  AND	wms_product_put.status= '1'
 		  AND wms_product_put.SAP_status IN ( 0, 2 )
 	</select>
     <select id="getReportList" resultType="com.op.system.api.domain.wms.wmsReportWork">
@@ -469,4 +468,53 @@
         SET attr1 = '1'
         where  pallet_code = #{palletCode}
     </update>
+    <update id="updateWmsProductStatus" >
+
+        UPDATE wms_product_put
+        SET status = '1'
+        WHERE plan_quantity = put_quantity
+          AND status != '1'
+        AND id = #{id}
+    </update>
+    <select id="selectWmsProductPutSAPByIds"    >
+        SELECT	DISTINCT
+            wms_product_put.id,
+            wms_product_put.work_order,
+            wms_product_put.factory_code,
+            wms_product_put.product_order,
+            wms_product_put.wh_code,
+            wms_product_put.wa_code,
+            wms_product_put.wl_code,
+            wms_product_put.product_name,
+            wms_product_put.product_code,
+            wms_product_put.product_sort,
+            wms_product_put.specification,
+            wms_product_put.unit_of_measure,
+            wms_product_put.plan_quantity,
+            wms_product_put.put_quantity,
+            wms_product_put.status,
+            wms_product_put.SAP_status,
+            wms_product_put.SAP_proof,
+            wms_product_put.SAP_message,
+            wms_product_put.put_date,
+            wms_product_put.batch_number,
+            wms_product_put.attr3,
+            wms_product_put.attr4,
+            wms_product_put.attr5,
+            wms_product_put.attr6,
+            wms_product_put.attr7,
+            wms_product_put.attr8,
+            wms_product_put.attr9,
+            wms_product_put.attr10,
+            wms_product_put.create_by,
+            wms_product_put.create_time,
+            wms_product_put.update_by,
+            wms_product_put.update_time ,
+            pro_order_workorder.product_date
+        FROM
+            wms_product_put
+                LEFT JOIN pro_order_workorder ON pro_order_workorder.workorder_code_sap=wms_product_put.product_order
+        WHERE	    wms_product_put.id = #{id}
+          AND wms_product_put.SAP_status IN ( 0, 2 )
+    </select>
 </mapper>