src/main/java/com/steerinfo/dil/controller/TestController.java

@@ -2288,12 +2288,27 @@ public class TestController extends BaseRESTfulController {
         }
     }
 
-    @Autowired
-    TaskDispatchOptimized taskDispatchOptimized;
 
-    //@PostMapping("dispatchTasksDcAll")
-    //public void dispatchTasksDcAll() {
-    //    taskDispatchOptimized.dispatchTasks();
-    //}
+    @PostMapping("reGenerateTransOrder")
+    public void reGenerateTransOrder(@RequestBody Map<String,Object> map) throws Exception {
+        omsTransOrderService.reGenerateTransOrder(map);
+    }
+
+    @PostMapping("autoGetAllAbnormalData")
+    public void autoGetAllAbnormalData() throws Exception {
+        List<Map<String,Object>> mapList = dzFeign.getAllAbnormalData();
+        HashSet<Object> objects = new HashSet<>();
+        List<String> objects1 = new ArrayList<>();
+        for(Map<String,Object> map : mapList) {
+            omsTransOrderService.reGenerateTransOrder(map);
+            objects.add(map.get("htbh"));
+            objects1.add(map.get("transOrderNumber").toString());
+        }
+        dzFeign.restartWeightResult(objects1);
+
+    }
+
+
+
 
 }

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

@@ -88,4 +88,14 @@ public interface DzFeign {
 
     @PostMapping("/api/v1/dz/test/getBlueList")
     Map<String, Object> getBlueList();
+
+    @PostMapping("/api/v1/dz/test/getSbdd")
+    String getSbdd(@RequestBody Map<String, Object> queryMap);
+
+    @PostMapping("/api/v1/dz/test/getTransOrderByNo")
+    Map<String, Object> getTransOrderByNo(Map<String, Object> map);
+
+    @PostMapping("/api/v1/dz/test/getAllAbnormalData")
+    List<Map<String, Object>> getAllAbnormalData();
+
 }

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

@@ -361,4 +361,13 @@ public interface OmsTransOrderMapper extends IBaseMapper<OmsTransOrder, BigDecim
     void updateIdcardsInfo(Map<String, Object> capacity);
 
     int countDriverScene(BigDecimal driverId);
+
+    List<String> getControlList(String sbdd);
+
+    BigDecimal checkTransOrder( Map<String, Object> map);
+
+    BigDecimal getPlanChildId(String planNo);
+
+    BigDecimal getLineId(BigDecimal transRequirementId);
+
 }

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

@@ -25,4 +25,6 @@ public interface TmsEnfactoryResultMapper extends IBaseMapper<TmsEnfactoryResult
 
 
     List<TmsEnfactoryResult> selectWeightMap(Map<String, Object> searchMap);
+
+    void updateResult(BigDecimal transOrderId);
 }

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

@@ -92,4 +92,5 @@ public interface TmsLoadResultMapper extends IBaseMapper<TmsLoadResult, BigDecim
 
     List<Map<String, Object>> selectTrainLoadResult();
 
+    void updateResult(BigDecimal transOrderId);
 }

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

@@ -22,4 +22,5 @@ public interface TmsOutfactoryResultMapper extends IBaseMapper<TmsOutfactoryResu
 
     List<TmsOutfactoryResult> selectWeightMap(Map<String, Object> searchMap);
 
+    void updateResult(BigDecimal transOrderId);
 }

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

@@ -19,4 +19,6 @@ public interface TmsQualityResultMapper extends IBaseMapper<TmsQualityResult, Bi
     List<Map<String,Object>> getTmsQualityResultList(Map<String,Object> map);
 
     List<Map<String,Object>> getTmsQualityResultList2(Map<String,Object> map);
+
+    void updateResult(BigDecimal transOrderId);
 }

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

@@ -25,4 +25,5 @@ public interface TmsSignInResultMapper extends IBaseMapper<TmsSignInResult, BigD
 
     String getCapacityInnerNumber(BigDecimal capacityId);
 
+    void updateResult(BigDecimal transOrderId);
 }

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

@@ -34,4 +34,5 @@ public interface TmsUnloadResultMapper extends IBaseMapper<TmsUnloadResult, BigD
 
     String selectFylx(BigDecimal transOrderChildId);
 
+    void updateResult(BigDecimal transOrderId);
 }

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

@@ -52,4 +52,6 @@ public interface TmsWeightResultMapper extends IBaseMapper<TmsWeightResult, BigD
     List<Map<String, Object>> syncTheoryWeight(Map<String, Object> map);
 
     List<TmsWeightResult>  selectForBzw();
+
+    void updateResult(BigDecimal transOrderId);
 }

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

@@ -2290,7 +2290,7 @@ public class OmsTransOrderServiceImpl {
         List<Map<String, Object>> mapList = (ArrayList) map.get("list");
         Map<String, Object> orderChild = new HashMap<>();
         orderChild.put("planChildId", DataChange.dataToBigDecimal(map.get("planChildId")));
-        List<OmsOrderChild> omsOrderChildList = omsOrderChildMapper.selectByParameters(orderChild);
+//        List<OmsOrderChild> omsOrderChildList = omsOrderChildMapper.selectByParameters(orderChild);
         //效验是否超出计划重量
         BigDecimal sumWeight = new BigDecimal(0);
         Map<String, Object> transPlanMap = new HashMap<>();
@@ -2458,7 +2458,39 @@ public class OmsTransOrderServiceImpl {
                     params.put("bhnm","");
                 }
                 mapArray.add(params);
-
+                if(planDetails.get("sbdd") != null) {
+                    //司磅地点不为空，判断是否需要做限制
+                    List<String> controlList = omsTransOrderMapper.getControlList(planDetails.get("sbdd").toString());
+                    //说明需要控制
+                    if(controlList.size() > 0 ) {
+                        Map<String, Object> dzInfoMap = dzFeign.getCapacityDetails(capacity);
+                        if(dzInfoMap == null || dzInfoMap.get("hzlx") == null) {
+                            throw new Exception("请核对车辆信息！");
+                        }
+                        if(!dzInfoMap.get("hzlx").toString().equals(capacity.get("capacityType"))) {
+                            throw new Exception("请核对车辆信息！");
+                        }
+                    }
+                }else{
+                    Map<String,Object> queryMap = new HashMap<>();
+                    queryMap.put("tdls",planDetails.get("tdls") != null ? planDetails.get("tdls"):planDetails.get("transRequirementId"));
+                    queryMap.put("businessScene",businessMap.get("businessScene"));
+                    String sbdd = dzFeign.getSbdd(queryMap);
+                    if(sbdd != null) {
+                        //司磅地点不为空，判断是否需要做限制
+                        List<String> controlList = omsTransOrderMapper.getControlList(sbdd);
+                        //说明需要控制
+                        if(controlList.size() > 0 ) {
+                            Map<String, Object> dzInfoMap = dzFeign.getCapacityDetails(capacity);
+                            if(dzInfoMap == null || dzInfoMap.get("hzlx") == null) {
+                                throw new Exception("请核对车辆信息！");
+                            }
+                            if(!dzInfoMap.get("hzlx").toString().equals(capacity.get("capacityType"))) {
+                                throw new Exception("请核对车辆信息！");
+                            }
+                        }
+                    }
+                }
                 //推送车辆档案
                 Map<String,Object> capacityMap = new HashMap<>();
                 capacity = omsTransOrderMapper.findCapacityMes(omsTransOrder.getCapacityId());
@@ -2466,7 +2498,6 @@ public class OmsTransOrderServiceImpl {
                 capacityMap.putAll(capacity);
                 capacityMap.putAll(driver);
                 daZongUtil.execute("30010000002", new Map[]{capacityMap});
-
                 //新增各类实绩
                 creatTransResult(lineId, omsTransOrder.getTransOrderId(), omsOrderChild.getPlanChildId(),map.get("userName").toString());
             }
@@ -3314,6 +3345,40 @@ public class OmsTransOrderServiceImpl {
         Map<String, Object> paramsCapcity = new HashMap<>();
         //推送车辆档案
         if (!"生产".equals(businessMap.get("businessScene"))) {
+            // 判断车辆hzlx是否与大宗一致
+            if(planDetails.get("sbdd") != null) {
+                //司磅地点不为空，判断是否需要做限制
+                List<String> controlList = omsTransOrderMapper.getControlList(planDetails.get("sbdd").toString());
+                //说明需要控制
+                if(controlList.size() > 0 ) {
+                    Map<String, Object> dzInfoMap = dzFeign.getCapacityDetails(capacity);
+                    if(dzInfoMap == null || dzInfoMap.get("hzlx") == null) {
+                        throw new Exception("请核对车辆信息！");
+                    }
+                    if(!dzInfoMap.get("hzlx").toString().equals(capacity.get("capacityType"))) {
+                        throw new Exception("请核对车辆信息！");
+                    }
+                }
+            }else{
+                Map<String,Object> queryMap = new HashMap<>();
+                queryMap.put("tdls",planDetails.get("tdls") != null ? planDetails.get("tdls"):planDetails.get("transRequirementId"));
+                queryMap.put("businessScene",businessMap.get("businessScene"));
+                String sbdd = dzFeign.getSbdd(queryMap);
+                if(sbdd != null) {
+                    //司磅地点不为空，判断是否需要做限制
+                    List<String> controlList = omsTransOrderMapper.getControlList(sbdd);
+                    //说明需要控制
+                    if(controlList.size() > 0 ) {
+                        Map<String, Object> dzInfoMap = dzFeign.getCapacityDetails(capacity);
+                        if(dzInfoMap == null || dzInfoMap.get("hzlx") == null) {
+                            throw new Exception("请核对车辆信息！");
+                        }
+                        if(!dzInfoMap.get("hzlx").toString().equals(capacity.get("capacityType"))) {
+                            throw new Exception("请核对车辆信息！");
+                        }
+                    }
+                }
+            }
             Map<String, Object> capacityMes = omsTransOrderMapper.findCapacityMes(omsTransOrder.getCapacityId());
             Map<String, Object> driverMes = omsTransOrderMapper.findDriverMes(omsTransOrder.getDriverId());
             paramsCapcity.putAll(capacityMes);
@@ -6472,4 +6537,92 @@ public class OmsTransOrderServiceImpl {
             e.printStackTrace();
         }
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public synchronized void reGenerateTransOrder(Map<String,Object> map) throws Exception {
+        try {
+            // 查询运输订单号是否存在系统
+            BigDecimal transOrderId = omsTransOrderMapper.checkTransOrder(map);
+            if(transOrderId != null) {
+                OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(transOrderId);
+                omsTransOrder.setDeleted(new BigDecimal(2));
+                omsTransOrderMapper.updateByPrimaryKeySelective(omsTransOrder);
+                return;
+            }
+            //去大宗查询数据
+            Map<String,Object> map1 = dzFeign.getTransOrderByNo(map);
+            String capacityNumber = map1.get("capacityNumber").toString();
+            // 根据车牌号查找车号
+            BigDecimal capacityId =omsTransOrderMapper.selectCapacityId(capacityNumber);
+            BigDecimal driverId = omsTransOrderMapper.selectDriverId(map1);
+            Date issueTime = DataChange.dataToDate(map1.get("issueTime").toString());
+            BigDecimal transRequirementId = DataChange.dataToBigDecimal(map1.get("transRequirementId").toString());
+            AmsTransRequirement amsTransRequirement = amsTransRequirementMapper.selectByPrimaryKey(transRequirementId);
+            BigDecimal requirementChildId = DataChange.dataToBigDecimal(map1.get("requirementChildId").toString());
+            AmsRequirementChild amsRequirementChild = amsRequirementChildMapper.selectByPrimaryKey(requirementChildId);
+            BigDecimal materialNumber = DataChange.dataToBigDecimal(map1.get("materialNumber").toString());
+            BigDecimal transOrderChildId = DataChange.dataToBigDecimal(map1.get("transOrderChildId").toString());
+            String planNo = map1.get("planNo").toString();
+            // 根据计划号及需求主子表信息找计划子表id
+            BigDecimal planChildId = omsTransOrderMapper.getPlanChildId(planNo);
+            // 查询路线id
+            BigDecimal lineId = amsTransRequirement.getLineId();
+            if(map1 == null) {
+                throw new Exception("未找到运单信息");
+            }
+            String transOrderNumber = map.get("transOrderNumber").toString();
+            //截取运单信息
+            if (transOrderNumber == null || !transOrderNumber.startsWith("YSDD") || transOrderNumber.length() < 12) {
+                throw new Exception("无效运单号");
+            }
+            // 截取固定前缀（前12位）后的部分
+            String remainingPart = transOrderNumber.substring(12);
+            // 去除前导0（如果没有0，会保持原字符串不变）
+            String serialNumber = remainingPart.replaceAll("^0+", "");
+            // 处理全0的特殊情况
+            if (serialNumber.isEmpty()) {
+                serialNumber = "0";
+            }
+            transOrderId = DataChange.dataToBigDecimal(serialNumber);
+            // 根据运单ID删除所有实绩
+            tmsEnfactoryResultMapper.updateResult(transOrderId);
+            tmsLoadResultMapper.updateResult(transOrderId);
+            tmsOutfactoryResultMapper.updateResult(transOrderId);
+            tmsSignInResultMapper.updateResult(transOrderId);
+            tmsWeightResultMapper.updateResult(transOrderId);
+            tmsUnloadResultMapper.updateResult(transOrderId);
+            tmsQualityResultMapper.updateResult(transOrderId);
+            OmsTransOrder omsTransOrder = new OmsTransOrder();
+            omsTransOrder.setTransOrderId(transOrderId);
+            omsTransOrder.setSerialNumber(transOrderNumber);
+            omsTransOrder.setCapacityId(capacityId);
+            omsTransOrder.setCurrentLineSeq(BigDecimal.ZERO);
+            omsTransOrder.setLineId(lineId);
+            omsTransOrder.setIssueTime(issueTime);
+            omsTransOrder.setInsertTime(new Date());
+            omsTransOrder.setDeleted(new BigDecimal(2));
+            omsTransOrder.setInsertUsername("admin");
+            omsTransOrder.setDriverId(driverId);
+            omsTransOrder.setInsertUpdateRemark("系统自动补录生成");
+            //新增运输订单子表
+            omsTransOrder.setOrderType(amsTransRequirement.getBusinessType());//设置运单类型为业务类型
+            entityDispose.disposeOmsTransOrder(omsTransOrder);
+            OmsOrderChild omsOrderChild = new OmsOrderChild();
+            omsOrderChild.setOrderChildId(transOrderChildId);
+            omsOrderChild.setTransOrderId(omsTransOrder.getTransOrderId());
+            omsOrderChild.setPlanChildId(planChildId);
+            omsOrderChild.setMaterialId(amsRequirementChild.getMaterialId());
+            omsOrderChild.setMaterialNumber(materialNumber);
+            omsOrderChild.setInsertTime(new Date());
+            omsOrderChild.setInsertUsername("admin");
+            omsOrderChild.setDeleted(BigDecimal.ZERO);
+            entityDispose.disposeOrderChild(omsOrderChild);
+            creatTransResult(lineId, transOrderId,planChildId, "admin");
+            omsTransOrderMapper.insertSelective(omsTransOrder);
+            omsOrderChildMapper.insertSelective(omsOrderChild);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
 }

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

@@ -54,6 +54,7 @@ public class TmsEnfactoryResultServiceImpl {
     public String  syncEnfactoryResult(Map<String, Object> map) throws Exception {
         List<BigDecimal> transOrderIds =  omsTransOrderMapper.getTransOrderIdByNumber(map);
         if(transOrderIds.size() != 1){
+            omsTransOrderService.reGenerateTransOrder(map);
             throw new Exception("运输订单异常！不能同步！");
         }
         Map<String,Object> searchMap = new HashMap<>();

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

@@ -84,6 +84,7 @@ public class TmsOutfactoryResultServiceImpl{
     public String syncOutfactoryResult(Map<String, Object> map) throws Exception {
         List<BigDecimal> transOrderIds =  omsTransOrderMapper.getTransOrderIdByNumber(map);
         if(transOrderIds.size() != 1){
+            omsTransOrderService.reGenerateTransOrder(map);
             throw new Exception("运输订单异常！不能同步！");
         }
         Map<String,Object> searchMap = new HashMap<>();

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

@@ -85,10 +85,10 @@ public class TmsWeightResultServiceImpl {
     @Transactional(rollbackFor = Exception.class)
     public String syncWeightResult(Map<String, Object> map) throws Exception {
         JSONObject jsonObject = new JSONObject(map);
-        log.debug(jsonObject);
         //查询运输订单
         List<BigDecimal> transOrderIds =  omsTransOrderMapper.getTransOrderIdByNumber(map);
         if(transOrderIds.size() != 1){
+            omsTransOrderService.reGenerateTransOrder(map);
             throw new Exception("运输订单异常！不能同步！");
         }
         //物资分录

src/main/resources/application-prod.yml

@@ -67,8 +67,8 @@ openfeign:
     url: ${WEBSOCKETFEIGN_URL:172.16.90.214:80}
 #    url: ${WEBSOCKETFEIGN_URL:localhost:8000}
   DzFeign:
-    url: ${DZFEIGN_URL:172.16.90.202:8056}
-#    url: ${DZFEIGN_URL:localhost:8056}
+#    url: ${DZFEIGN_URL:172.16.90.202:8056}
+    url: ${DZFEIGN_URL:localhost:8056}
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8055}
   TmiFeigh:

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

@@ -1899,6 +1899,7 @@
     ATR.CONTROL_MODE "controlMode",
     ATR.BUSINESS_TYPE "businessType",
     ATR.ALTERNATE_FIELDS13 "fhdd",
+    ATR.ALTERNATE_FIELDS14 "sbdd",
     ATR.ALTERNATE_FIELDS19 "tdls",
     DECODE(ATR.ALTERNATE_FIELDS20,1,'是','否') "isReplace",
     ATR.LINE_ID   "lineId",
@@ -1972,12 +1973,11 @@
     ON DBT.BUSINESS_TYPE_ID = ATR.BUSINESS_TYPE
     LEFT JOIN (
       SELECT OOC.PLAN_CHILD_ID "planChildId",
-             SUM(NVL(TWR.NET_WEIGHT,OOC.MATERIAL_NUMBER)) "numberUsed",
+             SUM(NVL(OOC.NET_WEIGHT,OOC.MATERIAL_NUMBER)) "numberUsed",
              COUNT(DISTINCT OTO.TRANS_ORDER_ID) "truckUsed"
       FROM OMS_ORDER_CHILD OOC
              LEFT JOIN OMS_TRANS_ORDER OTO
                        ON OTO.TRANS_ORDER_ID = OOC.TRANS_ORDER_ID
-             LEFT JOIN TMS_WEIGHT_RESULT TWR ON TWR.TRANS_ORDER_CHILD_ID = OOC.ORDER_CHILD_ID
       WHERE OTO.DELETED NOT IN (1, 6, 7) AND OOC .PLAN_CHILD_ID = #{planChildId}
       GROUP BY OOC .PLAN_CHILD_ID
     ) T ON T ."planChildId" = APC .PLAN_CHILD_ID
@@ -1999,6 +1999,7 @@
       ATR.CONTROL_MODE "controlMode",
       ATR.BUSINESS_TYPE "businessType",
       ATR.ALTERNATE_FIELDS13 "fhdd",
+      ATR.ALTERNATE_FIELDS14 "sbdd",
       ATR.ALTERNATE_FIELDS19 "tdls",
       ATR.LINE_ID   "lineId",
       ARC.ALTERNATE_FIELDS9 "tdfl",

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

@@ -5423,7 +5423,7 @@
   </update>
 
   <select id="sumWeightToTransPlan" resultType="java.lang.String">
-    select to_char(nvl(sum(apc.material_number),0), 'fm99999999990.0000')
+    select to_char(nvl(sum(apc.material_number),0), 'fm9999999999990.0000')
     from ams_requirement_child arc
            left join ams_plan_child apc
                      on arc.requirement_child_id = apc.requirement_child_id
@@ -6843,4 +6843,24 @@
     AND OTO.DELETED IN (4,5)
     AND OTO.BUSINESS_TYPE_NAME = '大宗销售订单'
   </select>
+  <select id="getControlList" resultType="java.lang.String">
+    SELECT GATEPOST_NO
+    FROM DIL_GATE_CONTROL DGC
+    WHERE DGC.IS_CONTROL = '是'
+      AND DGC.GATEPOST_NO IN (
+      SELECT REGEXP_SUBSTR(#{sbdd}, '[^,]+', 1, LEVEL)
+      FROM DUAL
+    CONNECT BY REGEXP_SUBSTR(#{sbdd}, '[^,]+', 1, LEVEL) IS NOT NULL
+      )
+  </select>
+  <select id="checkTransOrder" resultType="java.math.BigDecimal">
+    SELECT TRANS_ORDER_ID FROM OMS_TRANS_ORDER WHERE SERIAL_NUMBER = #{transOrderNumber}
+  </select>
+  <select id="getPlanChildId" resultType="java.math.BigDecimal">
+    SELECT APC.PLAN_CHILD_ID FROM AMS_TRANS_PLAN ATP LEFT JOIN AMS_PLAN_CHILD APC ON ATP.TRANS_PLAN_ID = APC.TRANS_PLAN_ID
+    WHERE ATP.SERIAL_NUMBER = #{planNo}
+  </select>
+  <select id="getLineId" resultType="java.math.BigDecimal">
+    SELECT ATR.LINE_ID FROM AMS_TRANS_REQUIREMENT ATR WHERE ATR.TRANS_REQUIREMENT_ID = #{transRequirementId}
+  </select>
 </mapper>

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

@@ -666,7 +666,7 @@
     #{item.resultId,jdbcType=DECIMAL}
      </foreach> 
   </update>
-  <delete id="batchDelete" parameterType="java.util.List">
+    <delete id="batchDelete" parameterType="java.util.List">
     delete from TMS_ENFACTORY_RESULT
     where RESULT_ID in 
     <foreach collection="list" item="id" open="(" close=")" separator=",">
@@ -867,4 +867,9 @@
     <include refid="where"/>
     ORDER BY RESULT_ID
   </select>
+  <update id="updateResult">
+    update TMS_ENFACTORY_RESULT
+    set deleted = 1
+    where trans_order_id = #{transOrderId}
+  </update>
 </mapper>

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

@@ -2222,7 +2222,7 @@
     WHERE ARC.TRANS_REQUIREMENT_ID = #{transRequirementId}
     )
   </update>
-  <select id="getLastLoadResult" resultMap="BaseResultMap">
+    <select id="getLastLoadResult" resultMap="BaseResultMap">
     SELECT * FROM TMS_LOAD_RESULT TLR
     WHERE TLR.RESULT_ID = #{resultId}
     AND TLR.DELETED = 0
@@ -2284,4 +2284,9 @@
       AND REGEXP_LIKE ( TLR.ALTERNATE_FIELDS6, '装车皮' )
       AND TLR.LOAD_END_TIME >= SYSDATE - 2
   </select>
+  <update id="updateResult">
+    update TMS_LOAD_RESULT
+    set deleted = 1
+    where trans_order_id = #{transOrderId}
+  </update>
 </mapper>

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

@@ -666,7 +666,7 @@
     #{item.resultId,jdbcType=DECIMAL}
      </foreach> 
   </update>
-  <delete id="batchDelete" parameterType="java.util.List">
+    <delete id="batchDelete" parameterType="java.util.List">
     delete from TMS_OUTFACTORY_RESULT
     where RESULT_ID in 
     <foreach collection="list" item="id" open="(" close=")" separator=",">
@@ -859,4 +859,9 @@
     <include refid="where"/>
     ORDER BY RESULT_ID
   </select>
+  <update id="updateResult">
+    update TMS_OUTFACTORY_RESULT
+    set deleted = 1
+    where trans_order_id = #{transOrderId}
+  </update>
 </mapper>

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

@@ -900,7 +900,7 @@
     #{item.resultId,jdbcType=DECIMAL}
      </foreach> 
   </update>
-  <delete id="batchDelete" parameterType="java.util.List">
+    <delete id="batchDelete" parameterType="java.util.List">
     delete from TMS_QUALITY_RESULT
     where RESULT_ID in 
     <foreach collection="list" item="id" open="(" close=")" separator=",">
@@ -1118,4 +1118,9 @@
         </if>
       </where>
     </select>
+  <update id="updateResult">
+    update TMS_QUALITY_RESULT
+    set deleted = 1
+    where trans_order_id = #{transOrderId}
+  </update>
 </mapper>

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

@@ -746,7 +746,7 @@
       #{item.resultId,jdbcType=DECIMAL}
     </foreach>
   </update>
-  <delete id="batchDelete" parameterType="java.util.List">
+    <delete id="batchDelete" parameterType="java.util.List">
     delete from TMS_SIGN_IN_RESULT
     where RESULT_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
@@ -952,4 +952,9 @@
       SELECT REMARK1 FROM RMS_CAPACITY
       WHERE CAPACITY_ID = #{capacityId}
     </select>
+  <update id="updateResult">
+    update TMS_SIGN_IN_RESULT
+    set deleted = 1
+    where trans_order_id = #{transOrderId}
+  </update>
 </mapper>

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

@@ -902,7 +902,7 @@
       #{item.resultId,jdbcType=DECIMAL}
     </foreach>
   </update>
-  <delete id="batchDelete" parameterType="java.util.List">
+    <delete id="batchDelete" parameterType="java.util.List">
     delete from TMS_UNLOAD_RESULT
     where RESULT_ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
@@ -1372,4 +1372,9 @@
       ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
       where ooc.ORDER_CHILD_ID = #{transOrderChildId}
     </select>
+  <update id="updateResult">
+    update TMS_UNLOAD_RESULT
+    set deleted = 1
+    where trans_order_id = #{transOrderId}
+  </update>
 </mapper>

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

@@ -1136,7 +1136,7 @@
       #{item.resultId,jdbcType=DECIMAL}
     </foreach>
   </update>
-  <delete id="batchDelete" parameterType="java.util.List">
+    <delete id="batchDelete" parameterType="java.util.List">
     delete from TMS_WEIGHT_RESULT
     where RESULT_ID in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
@@ -1686,7 +1686,7 @@
       and oto.deleted = 2
       and to_char(oto.insert_time, 'yyyy-MM-dd') = #{time}
   </select>
-    <select id="selectForBzw" resultType="com.steerinfo.dil.model.TmsWeightResult">
+  <select id="selectForBzw" resultType="com.steerinfo.dil.model.TmsWeightResult">
       SELECT
         TWR.RESULT_ID "resultId",
         TWR.POUND_NO "poundNo"
@@ -1703,5 +1703,10 @@
         AND TWR.ALTERNATE_FIELDS13 IS NULL
       ORDER BY
         TWR.RESULT_ID DESC FETCH NEXT 200 ROWS ONLY
-    </select>
+  </select>
+  <update id="updateResult">
+    update TMS_WEIGHT_RESULT
+    set deleted = 1
+    where trans_order_id = #{transOrderId}
+  </update>
 </mapper>