后台管理新增

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

@@ -182,4 +182,48 @@ public class BackgroundProcessingController extends BaseRESTfulController {
         backgroundProcessingMapper.updateOaRelevancy(map);
         return success();
     }
+
+
+    @ApiOperation(value = "手动放行接口")
+    @PostMapping("passThroughOrder")
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult passThroughOrder(@RequestBody(required = false) Map<String,Object> map) throws Exception{
+        if (map.get("orderNumber") != null) {
+            try {
+                int i = backgroundProcessingMapper.updatePassthrough(map);
+                if(i != 1){
+                    throw new Exception("数据不准确，请去数据库手动修改订单状态！");
+                }
+                return success(i);
+            } catch (Exception e) {
+                return failed("修改失败：" + e.getMessage());
+            }
+        }
+        return failed("orderNumber为空");
+    }
+
+    @ApiOperation(value = "钢材同车同物资接错单交换接口")
+    @PostMapping("interchangeOrder")
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult interchangeOrder(@RequestBody(required = false) Map<String,Object> map) throws Exception{
+        if (map.get("orderNumber1") != null && map.get("orderNumber2") != null) {
+            Map<String, Object> map1= backgroundProcessingMapper.getOrderInfoByOrderNumber(map.get("orderNumber1").toString());
+            Map<String, Object> map2= backgroundProcessingMapper.getOrderInfoByOrderNumber(map.get("orderNumber2").toString());
+            if(map1 == null || map2 == null
+                || map1.get("orderId") == null || map2.get("orderId") == null
+                    || map1.get("orderPlanId") == null || map2.get("orderPlanId") == null
+                        || map1.get("capacityId") == null || map2.get("capacityId") == null
+                            || !map1.get("capacityId").equals(map2.get("capacityId"))
+            ){
+                return failed("数据不准确，请去数据库手动修改！");
+            }
+            map1.put("newOrderPlanId", map2.get("orderPlanId"));
+            map1.put("remark", "交换订单:"+map.get("orderNumber2")+";原车序号:"+map1.get("orderPlanId")+";新车序号:"+map2.get("orderPlanId"));
+            map2.put("newOrderPlanId", map1.get("orderPlanId"));
+            map2.put("remark", "交换订单:"+map.get("orderNumber1")+";原车序号:"+map2.get("orderPlanId")+";新车序号:"+map1.get("orderPlanId"));
+            backgroundProcessingMapper.updateInterchangeOrder(map1);
+            backgroundProcessingMapper.updateInterchangeOrder(map2);
+        }
+        return success(1);
+    }
 }

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

@@ -81,4 +81,11 @@ public interface BackgroundProcessingMapper {
     int clearEnDetails(Map<String,Object> map);
 
     int updateOaRelevancy(Map<String, Object> map);
+
+    //手动放行
+    int updatePassthrough(Map<String, Object> map);
+
+    Map<String,Object> getOrderInfoByOrderNumber(@Param("orderNumber") String orderNumber);
+
+    int updateInterchangeOrder(Map<String, Object> map);
 }

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

@@ -304,4 +304,24 @@
         SET REMARK = #{remark}
         WHERE ORDER_NUMBER = #{orderNumber}
     </update>
+
+    <update id="updatePassthrough" parameterType="java.util.Map">
+        update TMSTRUCK_ENFACTORY_RESULT t set t.INSERT_UPDATE_REMARK = 'OK'
+        where t.RESULT_TOTAL_ID = (
+            SELECT ttr.RESULT_TOTAL_ID  FROM OMSTRUCK_ORDER oo LEFT JOIN TMSTRUCK_TOTAL_RESULT ttr ON oo.ORDER_ID = ttr.ORDER_ID
+            WHERE oo.ORDER_NUMBER = #{orderNumber} AND oo.ORDER_STATUS = 5
+        )
+    </update>
+
+    <select id="getOrderInfoByOrderNumber" parameterType="string" resultType="java.util.Map">
+        select t.ORDER_ID orderId, t.ORDER_PLAN_ID orderPlanId, t.CAPACITY_ID capacityId
+        from OMSTRUCK_ORDER t where t.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <update id="updateInterchangeOrder" parameterType="java.util.Map">
+        UPDATE OMSTRUCK_ORDER t
+        SET t.ORDER_PLAN_ID = #{newOrderPlanId},
+            t.INTERCHANGE_REMARK = #{remark}
+        WHERE t.ORDER_ID = #{orderId}
+    </update>
 </mapper>