代码更新

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java

@@ -75,7 +75,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
      *
      * @param moveinv_id
      */
-    void deleteById(String moveinv_id) {
+    public void deleteById(String moveinv_id) {
         //明细表
         WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_MoveInvDtl");
         //主表

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -34,6 +34,7 @@ import org.nl.wms.st.inbill.service.CheckOutBillService;
 import org.nl.wms.st.inbill.service.RawAssistIStorService;
 import org.nl.wms.st.inbill.service.StorPublicService;
 import org.nl.wms.st.instor.service.HandMoveStorService;
+import org.nl.wms.st.instor.service.impl.HandMoveStorServiceImpl;
 import org.nl.wms.st.instor.task.HandMoveStorAcsTask;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -1235,6 +1236,10 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv");
         //任务表
         WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
+        //移库单明细表
+        WQLObject move_dtl = WQLObject.getWQLObject("ST_IVT_MoveInvDtl");
+        //移库单主表
+        WQLObject move_mst = WQLObject.getWQLObject("ST_IVT_MoveInv");
 
         String iostorinv_id = whereJson.getString("iostorinv_id");
         //查询主表信息
@@ -1313,9 +1318,32 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             if (flag.size() == 0) {//仓位载具冻结数为0
                 //任务号不为空
                 if (ObjectUtil.isNotEmpty(dis.getString("task_id"))) {
+                    // 判断是否有移库的任务：有就取消掉
+                    JSONObject jsonTask = wo_Task.query("task_id = '" + dis.getString("task_id") + "'").uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(jsonTask)) {
+                        JSONArray moveArrTask = wo_Task.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_type = '010505'").getResultJSONArray(0);
+
+                        for (int j = 0; j < moveArrTask.size(); j++) {
+                            JSONObject jsonMoveTask = moveArrTask.getJSONObject(j);
+                            // 调用删除移库单
+                            JSONObject jsonMoveDtl = move_dtl.query("task_id = '" + jsonMoveTask.getString("task_id") + "'").uniqueResult(0);
+
+                            if (ObjectUtil.isNotEmpty(jsonMoveDtl)) {
+                                JSONObject jsonMoveMst = move_mst.query("moveinv_id = '" + jsonMoveDtl.getString("moveinv_id") + "' and is_delete = '0'").uniqueResult(0);
+
+                                if (ObjectUtil.isNotEmpty(jsonMoveMst)) {
+                                    HandMoveStorServiceImpl bean = SpringContextHolder.getBean(HandMoveStorServiceImpl.class);
+                                    bean.deleteById(jsonMoveMst.getString("moveinv_id"));
+                                }
+                            }
+
+                        }
+                    }
+
                     //更新对应任务为删除
                     map.put("is_delete", "1");
                     wo_Task.update(map, "task_id='" + dis.getString("task_id") + "'");
+
                 }
                 //解锁起点仓位点位
                 JSONObject from_start = new JSONObject();
@@ -2524,7 +2552,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         JSONArray disRowArrNew = new JSONArray();
         String option = ""; // 1.左 2.右
-        String placement_type = jsonRow.getString("placement_type"); // 单通或双通
+//        String placement_type = jsonRow.getString("placement_type"); // 单通或双通
+
+        for (int p = 0; p < disRowArr.size(); p++) {
+            JSONObject jsonObject4 = disRowArr.getJSONObject(p);
+            String placement_type = jsonObject4.getString("placement_type");
             // 双通
             if (StrUtil.equals(placement_type, "01")) {
 
@@ -2726,9 +2758,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
                 option = "2";
             }
+            break;
+        }
 
         /*
-         * 循环生成任务
+         * 生成任务
          */
         boolean canOut = false;
         int j = 0;

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql

@@ -88,7 +88,8 @@
                max(dis.point_id) AS point_id,
                max(attr.out_order_seq) AS out_order_seq,
                max(attr.block_num) AS block_num,
-               max(attr.row_num) AS row_num
+               max(attr.row_num) AS row_num,
+               max(attr.placement_type) AS placement_type
            FROM
                 ST_IVT_IOStorInvDis dis
                 LEFT JOIN st_ivt_structattr attr ON dis.struct_id = attr.struct_id