Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -40,4 +40,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     List<BigDecimal> selectOrderInfo(@Param("orderNumber") String orderNumber);
 
+    int updateOOMRemark(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -135,4 +135,6 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     int updateOrderMaterialId(BigDecimal jlOrderId);
 
+    BigDecimal selectNewPlanId(Map<String, Object> mesMap);
+
 }

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -230,6 +230,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             if (reason != null) {
                 amsSaleOrder.setInsertUpdateRemark(reason.toString());
             }
+            if (userName != null){
+                insertUpdateRemark = userName + amsSaleOrder.getInsertUpdateRemark() + "反关闭销售订单整单";
+                amsSaleOrder.setInsertUpdateRemark(insertUpdateRemark);
+            }
             // 反关闭销售订单下的所有分录
             result += amsSaleMaterialMapper.openAllSaleMaterial(saleOrderId);
             //反关闭这个销售订单下面被关闭的运单
@@ -251,7 +255,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                         omstruckOrder.setUpdateUsername("金蝶");
                         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
                     }
-
+                    //将订单分录里面的物资id
+                    omstruckOrderMapper.updateOOMRemark(DataChange.dataToBigDecimal(orderMap.get("orderId")));
                 }
             } catch (Exception e) {
                 e.printStackTrace();

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -91,19 +91,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Override
     @Transactional
     public String receiveTmsTruckWeightResultByDaGang(List<Map<String, Object>> mapList){
-        try{
-            new Thread( new Runnable() {
-                public void run(){
-                    try {
-                        newFileTool.newFile(mapList.toString(),"计量传输物流实绩");
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }).start();
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
         //遍历列表
         StringBuilder sb = new StringBuilder();
         for (Map<String, Object> map : mapList) {
@@ -149,11 +136,19 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         JSONObject jsonObject = new JSONObject(map);
         logger.info("计量信息:{}", jsonObject.toString());
         System.out.println("---------------------------------" + new Date() + "新接收到的计量实绩"  + "---------------------------------");
-        //try {
-        //    newFileTool.newFile(jsonObject.toString(),"计量");
-        //} catch (IOException e) {
-        //    e.printStackTrace();
-        //}
+        try{
+            new Thread( new Runnable() {
+                public void run(){
+                    try {
+                        newFileTool.newFile(jsonObject.toString(),"计量传输物流实绩");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
         if(map.get("flag") != null && map.get("flag").equals("GCXS")){
             System.out.println("这是钢材销售");
             TmstruckWeightResult tmstruckWeightResult = null;
@@ -725,6 +720,19 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * @return
      */
     public String linkageDeleteTransportOrder(List<Map<String, Object>> mapList) throws Exception{
+        try{
+            new Thread( new Runnable() {
+                public void run(){
+                    try {
+                        newFileTool.newFile(mapList.toString(),"计量-物流联动删单");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
         //联动删除
         for (Map<String, Object> map : mapList) {
             String orderNumber = (String) map.get("orderNumber");
@@ -791,13 +799,14 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     public String linkUpdateAPO(Map<String, Object> map, Integer orderType){
             //如果等于1 则代表是需要变更采购订单号的订单
             Map<String, Object> mesMap = tmstruckWeightResultMapper.getAPOMes(String.valueOf(map.get("ArrivalBillNo")));
-
             if (mesMap == null){
                 return map.get("ArrivalBillNo") + "系统没有此订单号！失败";
             }
             mesMap.put("orderNumber", map.get("orderNumber"));
-            if(orderType == 200){
-                //20订单修改的表不一样呀
+            if(orderType == 20 || orderType == 15 || orderType == 16 || orderType == 23 || orderType == 24){
+                //20订单修改的表不一样呀,找寻该采购订单对应的最新需求id和计划id
+                BigDecimal planId = tmstruckWeightResultMapper.selectNewPlanId(mesMap);
+                mesMap.put("planId",planId);
                 tmstruckWeightResultMapper.updatePurchaseInwordAPOId(mesMap);
                 tmstruckWeightResultMapper.updateOmsTruckMaterialId(mesMap);
             }else{

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -998,4 +998,9 @@
         SELECT DISTINCT  OO.ORDER_ID FROM OMSTRUCK_ORDER OO
         WHERE  OO.ORDER_NUMBER = #{orderNumber}
     </select>
+    <update id="updateOOMRemark">
+        UPDATE OMSTRUCK_ORDER_MATERIAL OOM
+        SET OOM.MATERIAL_PRIORITY = null
+        WHERE OOM.ORDER_ID = #{orderId}
+    </update>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -1068,16 +1068,9 @@
     </update>
 
     <update id="updatePurchaseInwordAPOId" parameterType="map">
-        update AMSTRUCK_INWARD_REQUIREMENT AIR
-        set AIR.PURCHASE_ORDER_ID = #{purchaseOrderId}
-        where AIR.REQUIREMENT_ID = (
-            select air.REQUIREMENT_ID
-            from OMSTRUCK_ORDER OO
-                     left join AMSTRUCK_INWARD_PLAN AIP on aip.plan_id = oo.order_plan_id
-                     LEFT JOIN amstruck_requirement_plan arp ON arp.plan_id = aip.plan_id
-                     LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arp.requirement_id
-            where OO.ORDER_NUMBER = #{orderNumber}
-            )
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_PLAN_ID = #{planId}
+        where OO.ORDER_NUMBER = #{orderNumber}
     </update>
     <update id="updateOrderMaterial" parameterType="map">
         update OMSTRUCK_ORDER_MATERIAL OOM
@@ -1247,4 +1240,12 @@
         SET OOM.SALE_MATERIAL_ID = null
         WHERE OOM.ORDER_ID = #{jlOrderId}
     </update>
+    <select id="selectNewPlanId" resultType="java.math.BigDecimal" parameterType="map">
+        SELECT ARP.PLAN_ID FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        WHERE AIR.PURCHASE_ORDER_ID = #{purchaseOrderId}
+        ORDER BY AIR.REQUIREMENT_ID DESC
+        FETCH FIRST 1 ROW ONLY
+    </select>
 </mapper>