内转修改

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 18:05
+ */
+
+@FeignClient(value = "dil-oms-dev", url = "${openfeign.OmsFeign.url}")
+public interface OmsFeign {
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
+    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId, @RequestParam("sqe") Integer sqe);
+
+}

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

@@ -73,4 +73,6 @@ public interface UtilsMapper {
     //通过订单号查询订单路段顺序号
     Integer getLineSequenceByOrderNumber(String orderNumber);
 
+    //通过总实绩查询是否有卸货实绩
+    Integer getUnloadResultByTotalId(BigDecimal totalId);
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.BmsTruckFeign;
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstrainWeightResultMapper;
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
@@ -47,6 +48,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Autowired
     UtilsMapper utilsMapper;
 
+    @Autowired
+    OmsFeign omsFeign;
+
     @Autowired
     TmstruckReceiptResultMapper tmstruckReceiptResultMapper;
 
@@ -382,12 +386,27 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
         tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
         tmstruckWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        Integer sqe = DataChange.dataToBigDecimal(oneMap.get("Sqe")).intValue(); //获取订单路段顺序号
+        int sqe = DataChange.dataToBigDecimal(oneMap.get("Sqe")).intValue(); //获取订单路段顺序号
         sqe = sqe + 1;
-        Map<String, Object> threeMap = new HashMap<>(); //用于更新路段顺序号
-        threeMap.put("orderLineSequence", sqe);
-        threeMap.put("orderNumber", map.get("orderNumber"));
-        utilsMapper.updateLineSeqByOrderIdOrNum2(threeMap); //更新订单路段顺序号
+        Object resultNetWeight = map.get("resultNetWeight");
+        if(resultNetWeight != null && !"".equals((String) resultNetWeight)){
+            //判断是否有卸货实绩已经卸过货 如果有卸货实绩 则结束订单
+            Integer resultId = utilsMapper.getUnloadResultByTotalId(DataChange.dataToBigDecimal(oneMap.get("totalId")));
+            if(resultId != null){
+                int orderIds = DataChange.dataToBigDecimal(oneMap.get("orderIds")).intValue();
+                omsFeign.closeInwardOrder(orderIds, sqe);
+            }else {
+                Map<String, Object> threeMap = new HashMap<>(); //用于更新路段顺序号
+                threeMap.put("orderLineSequence", sqe);
+                threeMap.put("orderNumber", map.get("orderNumber"));
+                utilsMapper.updateLineSeqByOrderIdOrNum2(threeMap); //更新订单路段顺序号
+            }
+        }else {
+            Map<String, Object> threeMap = new HashMap<>(); //用于更新路段顺序号
+            threeMap.put("orderLineSequence", sqe);
+            threeMap.put("orderNumber", map.get("orderNumber"));
+            utilsMapper.updateLineSeqByOrderIdOrNum2(threeMap); //更新订单路段顺序号
+        }
         //首先查询这个订单号的这个物资ID是否有计量实绩
         Map<String, Object> twoMap = tmstruckWeightResultMapper.selectResultIdByOrderNoAndMaterialId(map); //判断这个物资是否已经计量过
         Object resultCrossWeightTime = map.get("resultCrossWeightTime");

src/main/resources/application-dev.yml

@@ -7,5 +7,11 @@ spring:
   application:
     name: dal-dazhou-join-api
 
+openfeign:
+  OmsFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+  imFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
 server:
   port: 8006

src/main/resources/application-prod.yml

@@ -7,5 +7,11 @@ spring:
   application:
     name: dal-dazhou-join-api
 
+openfeign:
+  OmsFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+  imFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
 server:
   port: 8066

src/main/resources/bootstrap.yml

@@ -40,12 +40,6 @@ redis:
     time: 864000000
   database: 0
 
-openfeign:
-  #正式环境
-  imFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8055}
-  BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
 
 mybatis:
   type-aliases-package: com.steerinfo.dil.model

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

@@ -164,7 +164,8 @@
         select OO.ORDER_TYPE "orderType",
                TTR.RESULT_TOTAL_ID  "totalId",
                Rc.CAPACITY_NUMBER   "capacityNumber",
-               OO.ORDER_LINE_SEQUENCE   "Sqe"
+               OO.ORDER_LINE_SEQUENCE   "Sqe",
+               OO.ORDER_ID          "orderIds"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on TTR.ORDER_ID = OO.ORDER_ID
@@ -172,4 +173,8 @@
                            on RC.CAPACITY_ID = OO.CAPACITY_ID
         where  OO.ORDER_NUMBER = #{orderNumber}
     </select>
+
+    <select id="getUnloadResultByTotalId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select TUR.RESULT_ID from TMSTRUCK_UNLOAD_RESULT TUR where TUR.RESULT_TOTAL_ID = #{totalId}
+    </select>
 </mapper>