代码更新

wms/hd/nladmin-system/src/main/java/org/nl/ACS接口说明

@@ -0,0 +1,28 @@
+applyTaskManipulatorToWms	机械手申请任务	/api/acsToWms/task/manipulatorApply
+queryCribbingInfo	        获取木托盘信息	/api/acsToWms/task/queryCribbingInfo
+getVehicleCode	            获取托盘号	/api/wms/task/getEmptyVehicle_code
+feedbackPointStatusToWms	向WMS反馈点位状态	/api/acsToWms/task
+applyIntoKiln	            申请入窑输送任务	/api/acsToWms/task/group
+applyTaskToWms	            ACS向WMS申请任务	/api/acsToWms/task/apply
+requestSignalInteraction	请求信号交互	/api/Wms_AgvApi/SignalInteraction
+ispackage	                出窑申请去包装	/api/wms/task/ispackage
+getVehicleTokiln	        获取入窑托盘信息	api/
+queryDoorsStatus	        查询自动门状态	/api/acsToWms/queryDoorsStatus
+isTakePermission	        新锐AGV获取对接位是否允许取货	http://127.0.0.1:8080/wcs/isTakePermission/
+outKiln	                    出窑请求	/api/acsToWms/task/ispackage
+apply_OutEmpty	            申请出空	/api/acsToWms/task/emptyOutApply
+feedbackAgvStatus	        反馈AGV设备状态	/api/Wms_AgvApi/AgvStatus
+lnshApplyTaskToWms	        向WMS申请晟华任务	/api/acsToWms/task/apply
+apply_InEmpty	            申请进空	/api/acsToWms/task/emptyInApply
+applyOpenOrCloseDoor	    请求开门或关门	/api/acsToWms/task/status
+invokeDoor	                新锐AGV获取是否允许进入	http://127.0.0.1:8080/wcs/invokeDoor/
+enterOrder	                排产单确认	/api/acsToWms/task/sureProduceTask
+AGVWorkStatus	            新锐动作完成接口	http://127.0.0.1:8080/wcs/AGVWorkStatus
+inKiln	                    入窑扫码	/api/acsToWms/task/inKiln
+getDeviceStatusToWms	    向WMS获取设备状态	/api/Wms_AgvApi/GetDeviceStatus
+getVehiclePoint	            获取托盘点位	api
+deleteTask	                向wms申请删除任务	/api/acsToWms/task/deleteTask
+isPutPermission	            新锐AGV获取对接位是否允许放货	http://127.0.0.1:8080/wcs/isPutPermission/
+feedbackTaskStatusToWms	    向WMS反馈任务状态	/api/acsToWms/task/status
+requestTaskAgain	        再次申请任务	/api/acsToWms/task/secondApply
+getVehicle	                获取托盘信息	/api/acsToWms/task/getVehicleInfoBycode

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -7,6 +7,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Interner;
+import com.google.common.collect.Interners;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.UserInfoUtil;
@@ -62,7 +64,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Override
     public Map<String, Object> receiveTaskFromAcs(Map jsonObject) {
         String type = (String) jsonObject.get("type");
-    synchronized (type) {
+        Interner<String> pool = Interners.newWeakInterner();
+        synchronized (pool.intern(type)) {
             return acsToWmsService.receiveTaskFromAcsTrancs(jsonObject);
         }
     }
@@ -101,15 +104,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 if (StrUtil.equals(area_type, AreaEnum.BTHCQ.getCode())) {
                     fmjToPackIngTask.createTask((JSONObject) JSON.toJSON(jsonObject));
                     // 生成到包装位的任务时，下发托盘类型给RGV
-          String point_id =
+                    String point_id = pointTable.query("point_code ='" + device_code + "'").uniqueResult(0).getString("point_id");
-              pointTable
+                    String material_id = structivtTable.query("struct_id ='" + point_id + "'").uniqueResult(0)
-                  .query("point_code ='" + device_code + "'")
-                  .uniqueResult(0)
-                  .getString("point_id");
-          String material_id =
-              structivtTable
-                  .query("struct_id ='" + point_id + "'")
-                  .uniqueResult(0)
                             .getString("material_id");
                     JSONObject materiralObj1 =
                             WQLObject.getWQLObject("md_me_material")
@@ -152,8 +148,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     if (StrUtil.isEmpty(vehicle_code)) {
                         throw new BadRequestException("载具不能为空！");
                     }
-          JSONObject vehicleObj =
+                    JSONObject vehicleObj = WQLObject.getWQLObject("st_buss_vehiclegroup")
-              WQLObject.getWQLObject("st_buss_vehiclegroup")
                             .query("vehicle_code='" + vehicle_code + "'", "create_time desc")
                             .uniqueResult(0);
                     if (ObjectUtil.isEmpty(vehicleObj)) {
@@ -480,6 +475,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         groubObj.put("material_id", material_id);
         groubObj.put("material_code", materialObj.getString("material_code"));
         groubObj.put("material_name", materialObj.getString("material_name"));
+        groubObj.put("material_spec", materialObj.getString("material_spec"));
         groubObj.put("product_code", product_code);
         groubObj.put("cust_id", cust_id);
         groubObj.put("qty", qty);

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java

@@ -7,9 +7,9 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.nl.common.utils.UserInfoUtil;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
-import org.nl.common.utils.UserInfoUtil;
 import org.nl.utils.SpringContextHolder;
 import org.nl.wms.WorkProcedureEnum;
 import org.nl.wms.common.SortingUtil;
@@ -24,7 +24,6 @@ import org.nl.wms.sch.service.dto.PointDto;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 
@@ -87,6 +86,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
       endpointObj.put("lock_type", "00");
       endpointObj.put("point_status", "01");
       endpointObj.put("vehicle_code", vehicle_code);
+      endpointObj.put("update_time", DateUtil.now());
       pointTab.update(endpointObj);
       JSONObject startPointObj =
           pointTab
@@ -95,13 +95,13 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
       startPointObj.put("lock_type", "00");
       startPointObj.put("point_status", "00");
       startPointObj.put("vehicle_code", "");
+      startPointObj.put("update_time", DateUtil.now());
       pointTab.update(startPointObj);
       taskTab.update(jsonTask);
     }
   }
 
   @Override
-  @Transactional
   public void findStartPoint() {
     String task_status = TaskStatusEnum.SURE_END.getCode();
     WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java

@@ -37,14 +37,12 @@ public class CallMaterialTask extends AbstractAcsTask {
 
   @Override
   public void updateTaskStatus(JSONObject taskObj, String status) {
-        /**
+    /** 改变任务状态 */
-         *改变任务状态
-         **/
     String task_id = taskObj.getString("task_id");
     WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
     JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0);
     if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
-            //更新任务状态为执行中
+      // 更新任务状态为执行中
       jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
       jsonTask.put("update_time", DateUtil.now());
       taskTab.update(jsonTask);
@@ -53,8 +51,8 @@ public class CallMaterialTask extends AbstractAcsTask {
       map.put("update_optid", UserInfoUtil.getCurrentUserId());
       map.put("update_optname", UserInfoUtil.getNickName());
       map.put("update_time", DateUtil.now());
-            WQLObject.getWQLObject("ST_IVT_workProcedureIOS").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
+      WQLObject.getWQLObject("ST_IVT_workProcedureIOS")
-
+          .update(map, "task_id='" + jsonTask.getString("task_id") + "'");
     }
 
     if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
@@ -63,10 +61,11 @@ public class CallMaterialTask extends AbstractAcsTask {
       jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
       jsonTask.put("update_time", DateUtil.now());
       jsonTask.put("remark", "任务执行完成");
-            ///审核单据 增加库存 改变出入库表的状态
+      /// 审核单据 增加库存 改变出入库表的状态
       WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
-            JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
+      JSONObject mstObj =
-            //审核 加库存可和用数量
+          mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
+      // 审核 加库存可和用数量
       StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
       mstObj.put("bill_status", "50");
       mstObj.put("confirm_optid", UserInfoUtil.getCurrentUserId());
@@ -94,51 +93,67 @@ public class CallMaterialTask extends AbstractAcsTask {
       if (ObjectUtil.isNull(startPointDto)) {
         throw new BadRequestException("未找到可用点位:" + start_point_code);
       }
-            param.put("struct_id", startPointDto.getPoint_id());
+      Long point_id = startPointDto.getPoint_id();
+      param.put("struct_id", point_id);
       ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_IVT);
-            //解锁仓位，托盘信息，回写到点位上去
+      // 解锁仓位，托盘信息，回写到点位上去
       String vehicle_code = jsonTask.getString("vehicle_code");
       WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
-            JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("next_point_code") + "'").uniqueResult(0);
+      JSONObject endpointObj = pointTab
+              .query("point_code='" + jsonTask.getString("next_point_code") + "'")
+              .uniqueResult(0);
       endpointObj.put("lock_type", "00");
       endpointObj.put("point_status", "02");
       endpointObj.put("vehicle_code", vehicle_code);
+      endpointObj.put("update_time", DateUtil.now());
       pointTab.update(endpointObj);
 
-            ////如果终点是分拣区域，则更新木托盘铁托盘记录表
+      //// 如果终点是分拣区域，则更新木托盘铁托盘记录表
       String next_area = nextPointDto.getArea_type();
       if (StrUtil.equals(next_area, AreaEnum.FJQY.getCode())) {
-                //如果是下料料位置 托盘则是木托盘
+        // 如果是下料料位置 托盘则是木托盘
-                if (StrUtil.equals(next_point_code, "FJJXSXLW201") ||
+        if (StrUtil.equals(next_point_code, "FJJXSXLW201")
-                        StrUtil.equals(next_point_code, "FJJXSXLW202") ||
+            || StrUtil.equals(next_point_code, "FJJXSXLW202")
-                        StrUtil.equals(next_point_code, "FJJXSXLW301") ||
+            || StrUtil.equals(next_point_code, "FJJXSXLW301")
-                        StrUtil.equals(next_point_code, "FJJXSXLW302")) {
+            || StrUtil.equals(next_point_code, "FJJXSXLW302")) {
           JSONObject jo = new JSONObject();
           jo.put("device_code", next_point_code);
           jo.put("vehicle_code", vehicle_code);
           SortingUtil.record(jo);
         }
-                //如果是上料位置 则需要去找点位记录表上的托盘记录
+        // 如果是上料位置 则需要去找点位记录表上的托盘记录
         else {
           String flag = "8";
-                    if (StrUtil.equals(next_point_code, "FJJXSSLW101") || StrUtil.equals(next_point_code, "FJJXSSLW102")) {
+          if (StrUtil.equals(next_point_code, "FJJXSSLW101")
+              || StrUtil.equals(next_point_code, "FJJXSSLW102")) {
             flag = "7";
           }
-                    JSONArray paramArr = WQL.getWO("ACSTOMES_001").addParam("flag", flag).process().getResultJSONArray(0);
+          JSONArray paramArr =
+              WQL.getWO("ACSTOMES_001").addParam("flag", flag).process().getResultJSONArray(0);
           for (int i = 0; i < paramArr.size(); i++) {
             JSONObject jo = paramArr.getJSONObject(i);
             SortingUtil.record(jo);
           }
         }
       }
-            JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
+      JSONObject startPointObj =
+          pointTab
+              .query("point_code='" + jsonTask.getString("start_point_code") + "'")
+              .uniqueResult(0);
+      if (ObjectUtil.isNotEmpty(startPointObj)) {
+        // 仓位库存表【ST_IVT_StructIvt】
+        WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
         startPointObj.put("lock_type", "00");
         startPointObj.put("point_status", "00");
         startPointObj.put("vehicle_code", "");
+        startPointObj.put("update_time", DateUtil.now());
         pointTab.update(startPointObj);
         taskTab.update(jsonTask);
-            //2是出窑缓存货架，调用反馈出冷却缓冲区
+        ivtTab.delete("struct_id = '" + point_id + "'");
-            //3是木托盘缓存货架，调用反馈半木托出临时库区
+      }
+
+      // 2是出窑缓存货架，调用反馈出冷却缓冲区
+      // 3是木托盘缓存货架，调用反馈半木托出临时库区
       String point_type = startPointObj.getString("point_type");
       JSONObject jo = new JSONObject();
       jo.put("task_id", task_id);
@@ -150,21 +165,29 @@ public class CallMaterialTask extends AbstractAcsTask {
         wmsToJnServiceImpl.feedBackOutPartStock(jo);
       }
     }
-
   }
 
   @Override
   public void findStartPoint() {
     String task_status = TaskStatusEnum.SURE_START.getCode();
     WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-        JSONArray taskArry = taskTab.query("task_status='" + task_status + "'  AND handle_class='" + THIS_CLASS + "' AND is_delete='0'  ").getResultJSONArray(0);
+    JSONArray taskArry =
+        taskTab
+            .query(
+                "task_status='"
+                    + task_status
+                    + "'  AND handle_class='"
+                    + THIS_CLASS
+                    + "' AND is_delete='0'  ")
+            .getResultJSONArray(0);
     for (int i = 0; i < taskArry.size(); i++) {
       JSONObject taskObj = taskArry.getJSONObject(i);
       String task_id = taskObj.getString("task_id");
-            //1 将任务修改为分配  2将终点写入，完成分配，3 加锁点位
+      // 1 将任务修改为分配  2将终点写入，完成分配，3 加锁点位
-            //找一个合适的仓位
+      // 找一个合适的仓位
       WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
-            JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
+      JSONObject IosObj =
+          ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
       if (ObjectUtil.isEmpty(IosObj)) {
         throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！");
       }
@@ -175,33 +198,30 @@ public class CallMaterialTask extends AbstractAcsTask {
       if (ObjectUtil.isEmpty(inStructObj)) {
         throw new BadRequestException("未找到合适的出库仓位！");
       }
-            //修改单据状态，将终点填入
+      // 修改单据状态，将终点填入
       IosObj.put("bill_status", "20");
       IosObj.put("start_point_code", inStructObj.getString("struct_code"));
       ProcedureIOStable.update(IosObj);
-            //终点加锁
+      // 终点加锁
       HashMap lock_map = new HashMap();
       lock_map.put("lock_type", "01");
-            WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + inStructObj.getString("struct_code") + "'");
+      WQLObject.getWQLObject("sch_base_point")
-            //修改任务状态
+          .update(lock_map, "point_code = '" + inStructObj.getString("struct_code") + "'");
+      // 修改任务状态
       taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
       taskObj.put("update_optid", UserInfoUtil.getCurrentUserId());
       taskObj.put("update_optname", UserInfoUtil.getNickName());
       taskObj.put("update_time", DateUtil.now());
       taskTab.update(taskObj);
     }
-
   }
 
   @Override
-    public void findNextPoint() {
+  public void findNextPoint() {}
-
-    }
 
   @Override
-    @Transactional(rollbackFor = Exception.class)
   public String createTask(JSONObject form) {
-        //请求参数 终点不能为空 物料，数量，客户,批次，创建方式，托盘，是否满托不能为空！ 起点点位不为空时,单据编号不能为空！
+    // 请求参数 终点不能为空 物料，数量，客户,批次，创建方式，托盘，是否满托不能为空！ 起点点位不为空时,单据编号不能为空！
     String start_point_code = form.getString("start_point_code");
     String next_point_code = form.getString("next_point_code");
     String vehicle_code = form.getString("vehicle_code");
@@ -226,9 +246,15 @@ public class CallMaterialTask extends AbstractAcsTask {
     if (StrUtil.isEmpty(is_full)) {
       throw new BadRequestException("是否满托不能为空！");
     }
-        //判断终点有没有未完成的指令
+    // 判断终点有没有未完成的指令
-        JSONObject beforTaskObj = taskTable.
+    JSONObject beforTaskObj =
-                query("is_delete='0' and next_point_code='" + next_point_code + "' and task_status <>'" + TaskStatusEnum.FINISHED.getCode() + "'")
+        taskTable
+            .query(
+                "is_delete='0' and next_point_code='"
+                    + next_point_code
+                    + "' and task_status <>'"
+                    + TaskStatusEnum.FINISHED.getCode()
+                    + "'")
             .uniqueResult(0);
     if (ObjectUtil.isNotEmpty(beforTaskObj)) {
       throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
@@ -250,37 +276,43 @@ public class CallMaterialTask extends AbstractAcsTask {
       IosObj.put("bill_status", "20");
       iosTable.update(IosObj);
       PointDto StartPoint = pointService.findByCode(start_point_code);
-            JSONObject ivtObj = WQLObject.getWQLObject("ST_IVT_StructIvt").query("struct_id='" + StartPoint.getPoint_id() + "'").uniqueResult(0);
+      JSONObject ivtObj =
+          WQLObject.getWQLObject("ST_IVT_StructIvt")
+              .query("struct_id='" + StartPoint.getPoint_id() + "'")
+              .uniqueResult(0);
       if (ObjectUtil.isEmpty(ivtObj)) {
         throw new BadRequestException("仓位为'" + StartPoint.getPoint_code() + "'的库存信息不存在！");
       }
       qty = ivtObj.getString("canuse_qty");
       qty_unit_id = ivtObj.getString("qty_unit_id");
       ivt_workprocedure_id = ivtObj.getString("ivt_workprocedure_id");
-
     }
     PointDto nextPoint = pointService.findByCode(next_point_code);
-        //如果没给起点，根据终点去找工序，找一个合适的仓位 并且生成入库单，并且锁定点位
+    // 如果没给起点，根据终点去找工序，找一个合适的仓位 并且生成入库单，并且锁定点位
     if (StrUtil.isEmpty(start_point_code)) {
       if (StrUtil.isEmpty(workprocedure_id)) {
-                JSONObject workInfo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "1").addParam("code", next_point_code)
+        JSONObject workInfo =
-                        .process().uniqueResult(0);
+            WQL.getWO("QSTRUCT_RULE")
+                .addParam("flag", "1")
+                .addParam("code", next_point_code)
+                .process()
+                .uniqueResult(0);
         workprocedure_id = workInfo.getString("workprocedure_id");
         WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
         switch (workProcedureEnum) {
-                    //烧制工序
+            // 烧制工序
           case SZGX:
             startArea_type = AreaEnum.RYHCHJ.getCode();
             bill_type = BillTypeEnum.SZCK.getCode();
             ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
             break;
-                    //分拣工序
+            // 分拣工序
           case FJGX:
             startArea_type = AreaEnum.CYHCHJ.getCode();
             bill_type = BillTypeEnum.FJCK.getCode();
             ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
             break;
-                    //包装工序
+            // 包装工序
           case BZGX:
             startArea_type = AreaEnum.BTHCQ.getCode();
             bill_type = BillTypeEnum.FJCK.getCode();
@@ -291,13 +323,13 @@ public class CallMaterialTask extends AbstractAcsTask {
         // （机械手呼叫空托盘，需要呼叫半满托盘）如果请求有工序，假如是压制工序，则库存工序是压制，起点是出窑货架
         WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
         switch (workProcedureEnum) {
-                    //烧制工序
+            // 烧制工序
           case SZGX:
             startArea_type = AreaEnum.RYHCHJ.getCode();
             bill_type = BillTypeEnum.SZCK.getCode();
             ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
             break;
-                    //分拣工序
+            // 分拣工序
           case FJGX:
             startArea_type = AreaEnum.CYHCHJ.getCode();
             bill_type = BillTypeEnum.FJCK.getCode();
@@ -317,48 +349,95 @@ public class CallMaterialTask extends AbstractAcsTask {
       param.put("is_full", is_full);
       param.put("group_device", group_device);
       JSONObject outStructObj = StructFindUtil.getOutStruct(param);
-            if (ObjectUtil.isEmpty(outStructObj) && !StrUtil.equals(ivt_workprocedure_id, WorkProcedureEnum.YZGX.getId())) {
+      if (ObjectUtil.isEmpty(outStructObj)
-                //假如没有货，且下料位两个都为空，并且没有执行中的任务 下发acs动作信号
+          && !StrUtil.equals(ivt_workprocedure_id, WorkProcedureEnum.YZGX.getId())) {
+        // 假如没有货，且下料位两个都为空，并且没有执行中的任务 下发acs动作信号
         WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
         WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl();
-                //更新分拣机械手 上下料位置的点位状态
+        // 更新分拣机械手 上下料位置的点位状态
-                JSONArray parr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.FJQY.getCode()).addParam("flag", "4").process().getResultJSONArray(0);
+        JSONArray parr =
-                //JSONArray parr = point_table.query("area_type ='27'").getResultJSONArray(0);
+            WQL.getWO("ACSTOMES_001")
+                .addParam("area_type", AreaEnum.FJQY.getCode())
+                .addParam("flag", "4")
+                .process()
+                .getResultJSONArray(0);
+        // JSONArray parr = point_table.query("area_type ='27'").getResultJSONArray(0);
         PointUpdateUtil.updatePoint(parr);
-                JSONObject nextpointObj = point_table.query("point_code ='" + next_point_code + "'").uniqueResult(0);
+        JSONObject nextpointObj =
+            point_table.query("point_code ='" + next_point_code + "'").uniqueResult(0);
         if (StrUtil.equals(nextpointObj.getString("area_type"), "27")) {
-                    //找拆垛位置的对应的另外一个点位
+          // 找拆垛位置的对应的另外一个点位
-                    String other_point_code = point_table.query("point_code<>'" + next_point_code + "' " +
+          String other_point_code =
-                            "and  device_id='" + nextpointObj.getString("device_id") + "'  and device_point_type='02' ").uniqueResult(0).getString("point_code");
+              point_table
-                    String point_status01 = point_table.query("point_code ='" + next_point_code + "'").uniqueResult(0).getString("point_status");
+                  .query(
-                    String point_status02 = point_table.query("point_code ='" + other_point_code + "'").uniqueResult(0).getString("point_status");
+                      "point_code<>'"
-                    //没有执行中的任务
+                          + next_point_code
+                          + "' "
+                          + "and  device_id='"
+                          + nextpointObj.getString("device_id")
+                          + "'  and device_point_type='02' ")
+                  .uniqueResult(0)
+                  .getString("point_code");
+          String point_status01 =
+              point_table
+                  .query("point_code ='" + next_point_code + "'")
+                  .uniqueResult(0)
+                  .getString("point_status");
+          String point_status02 =
+              point_table
+                  .query("point_code ='" + other_point_code + "'")
+                  .uniqueResult(0)
+                  .getString("point_status");
+          // 没有执行中的任务
           WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
-                    JSONObject task1 = task_table.query("next_point_code ='" + next_point_code + "' and is_delete='0' and task_status<>'07'").uniqueResult(0);
+          JSONObject task1 =
-                    JSONObject task2 = task_table.query("next_point_code ='" + other_point_code + "' and is_delete='0' and task_status<>'07'").uniqueResult(0);
+              task_table
-                    if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00") && ObjectUtil.isEmpty(task1) && ObjectUtil.isEmpty(task2)) {
+                  .query(
+                      "next_point_code ='"
+                          + next_point_code
+                          + "' and is_delete='0' and task_status<>'07'")
+                  .uniqueResult(0);
+          JSONObject task2 =
+              task_table
+                  .query(
+                      "next_point_code ='"
+                          + other_point_code
+                          + "' and is_delete='0' and task_status<>'07'")
+                  .uniqueResult(0);
+          if (StrUtil.equals(point_status01, "00")
+              && StrUtil.equals(point_status02, "00")
+              && ObjectUtil.isEmpty(task1)
+              && ObjectUtil.isEmpty(task2)) {
             JSONObject jo = new JSONObject();
             JSONArray arr = new JSONArray();
-//                        jo.put("device_code", "FJJXS1");
+            //                        jo.put("device_code", "FJJXS1");
-//                        jo.put("code", "to_feedback");
+            //                        jo.put("code", "to_feedback");
-//                        jo.put("value", "10");
+            //                        jo.put("value", "10");
-//                        arr.add(jo);
+            //                        arr.add(jo);
-//                        wmsToAcsService.action(arr);
+            //                        wmsToAcsService.action(arr);
           }
         }
-                if (StrUtil.equals(next_point_code, "FJJXSSLW301") || StrUtil.equals(next_point_code, "FJJXSSLW301")) {
+        if (StrUtil.equals(next_point_code, "FJJXSSLW301")
-                    String point_status01 = point_table.query("point_code ='FJJXSSLW301'").uniqueResult(0).getString("point_status");
+            || StrUtil.equals(next_point_code, "FJJXSSLW301")) {
-                    String point_status02 = point_table.query("point_code ='FJJXSSLW301'").uniqueResult(0).getString("point_status");
+          String point_status01 =
+              point_table
+                  .query("point_code ='FJJXSSLW301'")
+                  .uniqueResult(0)
+                  .getString("point_status");
+          String point_status02 =
+              point_table
+                  .query("point_code ='FJJXSSLW301'")
+                  .uniqueResult(0)
+                  .getString("point_status");
           if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00")) {
             JSONObject jo = new JSONObject();
             JSONArray arr = new JSONArray();
-//                        jo.put("device_code", "FJJXS3");
+            //                        jo.put("device_code", "FJJXS3");
-//                        jo.put("code", "to_feedback");
+            //                        jo.put("code", "to_feedback");
-//                        jo.put("value", "10");
+            //                        jo.put("value", "10");
-//                        arr.add(jo);
+            //                        arr.add(jo);
-//                        wmsToAcsService.action(arr);
+            //                        wmsToAcsService.action(arr);
           }
-
         }
         throw new BadRequestException("未找到合适的出库仓位！");
       }
@@ -367,7 +446,7 @@ public class CallMaterialTask extends AbstractAcsTask {
 
       start_point_code = outStructObj.getString("struct_code");
       vehicle_code = outStructObj.getString("vehicle_code");
-            //创建出库单据
+      // 创建出库单据
       JSONObject iosObj = new JSONObject();
       iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + "";
       iosObj.put("iostorinv_id", iostorinv_id);
@@ -381,7 +460,7 @@ public class CallMaterialTask extends AbstractAcsTask {
       iosObj.put("producetask_id", outStructObj.getString("producetask_id"));
       iosObj.put("qty", qty);
       iosObj.put("qty_unit_id", qty_unit_id);
-            //默认是分配状态
+      // 默认是分配状态
       iosObj.put("bill_status", "20");
       iosObj.put("start_point_code", start_point_code);
       iosObj.put("end_point_code", next_point_code);
@@ -394,25 +473,25 @@ public class CallMaterialTask extends AbstractAcsTask {
       iosObj.put("create_name", "管理员");
       iosObj.put("create_time", DateUtil.now());
       WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj);
-            //将组盘里面的task_id改为当前的任务
+      // 将组盘里面的task_id改为当前的任务
       WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
       JSONObject groupObj = groupTable.query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
       if (ObjectUtil.isNotEmpty(groupObj)) {
         groupObj.put("task_id", task_id);
         groupTable.update(groupObj);
       }
-
     }
 
     task_status = TaskStatusEnum.START_AND_POINT.getCode();
 
     PointDto startPoint = pointService.findByCode(start_point_code);
     start_area = nextPoint.getArea_type();
-        //起点点加锁
+    // 起点点加锁
     HashMap lock_map = new HashMap();
     lock_map.put("lock_type", "01");
-        WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + start_point_code + "'");
+    WQLObject.getWQLObject("sch_base_point")
-        //减少库存可用数量
+        .update(lock_map, "point_code = '" + start_point_code + "'");
+    // 减少库存可用数量
     StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
     JSONObject param = new JSONObject();
     param.put("material_id", material_id);
@@ -448,17 +527,16 @@ public class CallMaterialTask extends AbstractAcsTask {
 
   @Override
   public void forceFinish(String task_id) {
-        JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+    JSONObject taskObj =
+        WQLObject.getWQLObject("SCH_BASE_Task")
+            .query("task_id = '" + task_id + "'")
+            .uniqueResult(0);
     this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
   }
 
   @Override
-    public void pullBack(String task_id) {
+  public void pullBack(String task_id) {}
-
-    }
 
   @Override
-    public void cancel(String task_id) {
+  public void cancel(String task_id) {}
-
-    }
 }

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ConveyorTask.java

@@ -4,16 +4,13 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.exception.BadRequestException;
-import org.nl.modules.system.util.CodeUtil;
 import org.nl.common.utils.UserInfoUtil;
+import org.nl.exception.BadRequestException;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.AreaEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;
-import org.nl.wms.sch.task.TaskTypeEnum;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  *
@@ -53,7 +50,6 @@ public class ConveyorTask extends AbstractAcsTask {
 
     }
 
-    @Transactional
     @Override
     public void findNextPoint() {
     }

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/FmjToPackIngTask.java

@@ -7,9 +7,9 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.UserInfoUtil;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
-import org.nl.common.utils.UserInfoUtil;
 import org.nl.utils.SpringContextHolder;
 import org.nl.wms.WorkProcedureEnum;
 import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
@@ -23,7 +23,6 @@ import org.nl.wms.st.ivt.IvtChangeTypeEnum;
 import org.nl.wms.st.ivt.StoreIvtServiceImpl;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 
@@ -68,6 +67,7 @@ public class FmjToPackIngTask extends AbstractAcsTask {
             startPointObj.put("lock_type", "00");
             startPointObj.put("point_status", "00");
             startPointObj.put("vehicle_code", "");
+            startPointObj.put("update_time", DateUtil.now());
             pointTab.update(startPointObj);
             ///审核单据 增加库存 改变出入库表的状态
             WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
@@ -122,7 +122,6 @@ public class FmjToPackIngTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional
     public String createTask(JSONObject form) {
         String start_point_code = form.getString("start_point_code");
         WQLObject point_table = WQLObject.getWQLObject("sch_base_point");

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/RgvTask.java

@@ -5,16 +5,13 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.exception.BadRequestException;
-import org.nl.modules.system.util.CodeUtil;
 import org.nl.common.utils.UserInfoUtil;
+import org.nl.exception.BadRequestException;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.AreaEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;
-import org.nl.wms.sch.task.TaskTypeEnum;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 入库任务生成
@@ -54,7 +51,6 @@ public class RgvTask extends AbstractAcsTask {
 
     }
 
-    @Transactional
     @Override
     public void findNextPoint() {
     }

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java

@@ -10,7 +10,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.UserInfoUtil;
 import org.nl.exception.BadRequestException;
-import org.nl.modules.system.util.CodeUtil;
 import org.nl.utils.SpringContextHolder;
 import org.nl.wms.common.PointUpdateUtil;
 import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
@@ -22,7 +21,6 @@ import org.nl.wms.sch.service.dto.PointDto;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 
@@ -63,6 +61,7 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
       endpointObj.put("lock_type", "00");
       endpointObj.put("point_status", "01");
       endpointObj.put("vehicle_code", vehicle_code);
+      endpointObj.put("update_time", DateUtil.now());
       pointTab.update(endpointObj);
 
       JSONObject startPointObj =
@@ -78,6 +77,7 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
       startPointObj.put("lock_type", "00");
       startPointObj.put("point_status", "00");
       startPointObj.put("vehicle_code", "");
+      startPointObj.put("update_time", DateUtil.now());
       pointTab.update(startPointObj);
       taskTab.update(jsonTask);
 

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java

@@ -112,6 +112,7 @@ public class SendMaterialTask extends AbstractAcsTask {
       endpointObj.put("lock_type", "00");
       endpointObj.put("point_status", "02");
       endpointObj.put("vehicle_code", vehicle_code);
+      endpointObj.put("update_time", DateUtil.now());
       pointTab.update(endpointObj);
 
       JSONObject startPointObj =
@@ -122,6 +123,7 @@ public class SendMaterialTask extends AbstractAcsTask {
       startPointObj.put("lock_type", "00");
       startPointObj.put("point_status", "00");
       startPointObj.put("vehicle_code", "");
+      startPointObj.put("update_time", DateUtil.now());
       pointTab.update(startPointObj);
 
       taskTab.update(jsonTask);
@@ -152,14 +154,7 @@ public class SendMaterialTask extends AbstractAcsTask {
   public void findNextPoint() {
     String task_status = TaskStatusEnum.SURE_START.getCode();
     WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
-    JSONArray taskArry =
+    JSONArray taskArry = taskTab.query("task_status='" + task_status + "'  AND handle_class='" + THIS_CLASS + "' AND is_delete='0'  ")
-        taskTab
-            .query(
-                "task_status='"
-                    + task_status
-                    + "'  AND handle_class='"
-                    + THIS_CLASS
-                    + "' AND is_delete='0'  ")
             .getResultJSONArray(0);
     for (int i = 0; i < taskArry.size(); i++) {
       JSONObject taskObj = taskArry.getJSONObject(i);
@@ -200,7 +195,7 @@ public class SendMaterialTask extends AbstractAcsTask {
   }
 
   @Override
-  //    @Transactional(rollbackFor = Exception.class)
+//      @Transactional(rollbackFor = Exception.class)
   public String createTask(JSONObject form) {
     // 请求参数 载具、起点  物料，数量，客户,批次，创建方式 是否满托不能为空！ 终点可以不为空时，入库单据编号不能为空
     String start_point_code = form.getString("start_point_code");
@@ -231,7 +226,7 @@ public class SendMaterialTask extends AbstractAcsTask {
                     + "'")
             .uniqueResult(0);
     if (ObjectUtil.isNotEmpty(beforTaskObj)) {
-      throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
+//      throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
     }
     PointService pointService = SpringContextHolder.getBean(PointService.class);
     PointDto startPoint = pointService.findByCode(start_point_code);
@@ -384,8 +379,7 @@ public class SendMaterialTask extends AbstractAcsTask {
             .process()
             .uniqueResult(0);
     if (StrUtil.equals(WorkProcedureEnum.YZGX.getCode(), workInfo.getString("workprocedure_code"))
-        || StrUtil.equals(
+        || StrUtil.equals(WorkProcedureEnum.FJGX.getCode(), workInfo.getString("workprocedure_code"))) {
-            WorkProcedureEnum.FJGX.getCode(), workInfo.getString("workprocedure_code"))) {
       WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
       JSONObject groupInfo = groupTable.query("group_id='" + group_id + "'").uniqueResult(0);
       if (ObjectUtil.isNotEmpty(groupInfo)) {

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/StructToConveyorTask.java

@@ -101,6 +101,7 @@ public class StructToConveyorTask extends AbstractAcsTask {
             startPointObj.put("lock_type", "00");
             startPointObj.put("point_status", "00");
             startPointObj.put("vehicle_code", "");
+            startPointObj.put("update_time", DateUtil.now());
             pointTab.update(startPointObj);
             taskTab.update(jsonTask);
         }

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToConveyorTask.java

@@ -4,32 +4,19 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.exception.BadRequestException;
-import org.nl.modules.system.util.CodeUtil;
 import org.nl.common.utils.UserInfoUtil;
+import org.nl.exception.BadRequestException;
 import org.nl.utils.SpringContextHolder;
-import org.nl.wms.BussConstant;
-import org.nl.wms.WorkProcedureEnum;
-import org.nl.wms.common.StructFindUtil;
 import org.nl.wms.ext.acs.service.WmsToJnService;
 import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
 import org.nl.wms.sch.manage.AbstractAcsTask;
-import org.nl.wms.sch.manage.AreaEnum;
-import org.nl.wms.sch.manage.BillTypeEnum;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.dto.PointDto;
-import org.nl.wms.sch.service.impl.PointServiceImpl;
-import org.nl.wms.st.ivt.IvtChangeTypeEnum;
-import org.nl.wms.st.ivt.StoreIvtServiceImpl;
-import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 
@@ -37,9 +24,6 @@ import java.util.HashMap;
 @Slf4j
 public class ToConveyorTask extends AbstractAcsTask {
     private final String THIS_CLASS = ToConveyorTask.class.getName();
-
-
-
     @Override
     public void updateTaskStatus(JSONObject taskObj, String status) {
         /**
@@ -91,7 +75,6 @@ public class ToConveyorTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional
     public String createTask(JSONObject form) {
         //请求参数 载具、起点  物料，数量，客户,批次，创建方式 是否满托不能为空！ 终点可以不为空时，入库单据编号不能为空
         String vehicle_code = form.getString("vehicle_code");

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java

@@ -4,15 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.exception.BadRequestException;
-import org.nl.modules.system.util.CodeUtil;
 import org.nl.common.utils.UserInfoUtil;
+import org.nl.exception.BadRequestException;
 import org.nl.utils.SpringContextHolder;
-import org.nl.wms.common.StructFindUtil;
 import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -20,7 +17,6 @@ import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.dto.PointDto;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 
@@ -31,7 +27,6 @@ public class ToPackIngTask extends AbstractAcsTask {
   private final String THIS_CLASS = ToPackIngTask.class.getName();
 
   @Override
-  @Transactional
   public void updateTaskStatus(JSONObject taskObj, String status) {
     /** 改变任务状态 */
     String task_id = taskObj.getString("task_id");
@@ -73,6 +68,7 @@ public class ToPackIngTask extends AbstractAcsTask {
         startPointObj.put("lock_type", "00");
         startPointObj.put("point_status", "00");
         startPointObj.put("vehicle_code", "");
+        startPointObj.put("update_time", DateUtil.now());
         pointTab.update(startPointObj);
       }
       // 调用mes接口

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoOutStructTask.java

@@ -10,7 +10,6 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.wms.WorkProcedureEnum;
 import org.nl.wms.common.PointUpdateUtil;
-import org.nl.wms.common.StructFindUtil;
 import org.nl.wms.sch.manage.buss.CallMaterialTask;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
@@ -33,7 +32,6 @@ public class AutoOutStructTask {
     void doExecute() {
         log.info("定时任务AutoOutStructTask开始执行:");
 
-        WQLObject param_Table = WQLObject.getWQLObject("sys_param");
         //达到可以出库的数量
         //1.首先更新所有输送线的点位状态
         JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", "07").addParam("flag", "4").process().getResultJSONArray(0);
@@ -42,39 +40,14 @@ public class AutoOutStructTask {
         // 查询空余的入窑输送线
         JSONArray arr = WQL.getWO("QSTRUCT_RULE").addParam("flag", "13")
                 .process().getResultJSONArray(0);
-        /*String material_id = "";
-        String vehicle_code = "";
-        String point_code = "";
-        for (int i = 0; i < arr.size(); i++) {
-            JSONObject jo = arr.getJSONObject(i);
-            String material_type = jo.getString("material_type");
-            String material_code = jo.getString("material_code");
-            if (StrUtil.equals(material_code, "0")) {
-                material_code = "";
-            }
-            JSONObject outObj = WQL.getWO("QSTRUCT_RULE").addParam("flag", "14")
-                    .addParam("material_type", material_type)
-                    .process().uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(outObj)) {
-                material_id = outObj.getString("material_id");
-                vehicle_code = outObj.getString("vehicle_code");
-                point_code = jo.getString("point_code");
-                break;
-            }
-        }
-        if (StrUtil.isEmpty(material_id)) {
-            return;
-        }*/
         // 遍历输送线，给每一个输送线创建叫料任务
         CallMaterialTask callMaterialTask = new CallMaterialTask();
         for (Object o : arr) {
             JSONObject line = (JSONObject) o;
 
-
             JSONObject param = new JSONObject();
             param.put("flag", "9");
             param.put("area_type", "01");
-//            param.put("if_full", "1");
             param.put("material_type", line.getString("material_type"));
             String lineMaterialCode = line.getString("material_code");
             if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0")) {
@@ -87,7 +60,6 @@ public class AutoOutStructTask {
                 taskObj.put("vehicle_code", structObj.get("vehicle_code"));
                 taskObj.put("material_id", structObj.get("material_id"));
                 taskObj.put("create_mode", "02");
-//                taskObj.put("is_full", "1");
                 taskObj.put("is_full", structObj.get("is_full"));
                 taskObj.put("workprocedure_id", WorkProcedureEnum.SZGX.getId());
                 callMaterialTask.createTask(taskObj);

wms/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -63,7 +63,7 @@ https://juejin.cn/post/6844903775631572999
         <root level="debug">
             <appender-ref ref="CONSOLE"/>
         </root>
-        <logger name="org.springframework" level="ERROR" additivity="false">
+        <!--<logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
         <logger name="org.hibernate" level="ERROR" additivity="false">
@@ -95,7 +95,7 @@ https://juejin.cn/post/6844903775631572999
         </logger>
         <logger name="nl.basjes" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-        </logger>
+        </logger>-->
     </springProfile>
     <!--测试环境:打印控制台-->
     <springProfile name="test">