Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java

@@ -95,7 +95,6 @@ public class AutoCallAirShaftTask {
      * 套拔轴缓存位满了、没有分切计划，则触发自动创建套拔轴任务
      * update: 24/04/28 内包间只是区分气胀轴大小（即代数），不需要区分锂电/标箔
      */
-    @Transactional(rollbackFor = Exception.class)
     public void run() {
         log.info("自动呼叫套轴开始执行...");
         // 判断配置参数是否只做拔轴
@@ -105,7 +104,11 @@ public class AutoCallAirShaftTask {
         // 1、获取空的插拔轴位(无任务)
         List<BstIvtShafttubeivt> emptyPoints = bstIvtShafttubeivtService.getAllShaftPointsByConditions("2",
                 "0", "0");
-        emptyPoints.forEach(empty -> {
+        emptyPoints.forEach(empty -> doCallShaft(empty, isOnlyPulling, tzDay, paramObj));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void doCallShaft(BstIvtShafttubeivt empty, Param isOnlyPulling, Param tzDay, Param paramObj) {
         // 标箔：1，锂电：2 改：大小：4代5代
         String specification = empty.getQzz_generation();
         String location = empty.getPoint_location();
@@ -261,7 +264,6 @@ public class AutoCallAirShaftTask {
             TaskUtils.updateOptMessageBySlitterPlan(p);
         });
         slittingproductionplanService.updateBatchById(needPlans);
-        });
     }
 
     /**

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java

@@ -409,8 +409,6 @@ public class SlitterServiceImpl implements SlitterService {
         if (shafttubeivts.size() == 0) {
             throw new BadRequestException("未找到可存放气涨轴规格「" + qzzSize + "」的空暂存位");
         }
-        // todo: 过滤空位后面是否有轴的位置
-
         BstIvtShafttubeivt shafttubeivt = shafttubeivts.get(0);
         RLock lockPoint = redissonClient.getLock(shafttubeivt.getPoint_code());
         boolean tryLockPoint = lockPoint.tryLock(0, TimeUnit.SECONDS);
@@ -1975,6 +1973,7 @@ public class SlitterServiceImpl implements SlitterService {
             plan.setIs_parent_ok("0");
             plan.setIs_child_tz_ok("0");
             plan.setIs_child_ps_ok("0");
+            plan.setPaper_weight("0");
             plan.setQzzno("");
             plan.setIs_delete("0");
             plan.setSale_order_name("-");

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java

@@ -127,6 +127,11 @@ public enum IOSEnum {
             "子卷下线行架任务", "16","退货入库行架任务", "14","RGV输送任务", "15",
             "木箱堆叠行架任务", "17"
     )),
+
+    // acs反馈异常出库
+    ACS_EXCEPTIONAL_TYPE(MapOf.of("入库满入", "1","浅货位有货(入库)", "4",
+            "出库空出", "2","浅货位有货(出库)", "3"
+    )),
     ;
 
     private Map<String, String> code;

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java

@@ -138,4 +138,11 @@ public interface IStIvtIostorinvOutService extends IService<StIvtIostorinv> {
      * @param whereJson: 任务对象
      */
     void finishTask(JSONObject whereJson);
+
+    /**
+     * 出库浅货位有货阻挡异常处理
+     * @param whereJson /
+     * @return String 任务标识
+     */
+    String taskExceptionalOut(JSONObject whereJson);
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.b_lms.pdm_manage.enums.SUBEnum;
+import org.nl.b_lms.sch.tasks.TwoExcepionalMoveTask;
 import org.nl.b_lms.sch.tasks.TwoOutExceptionalTask;
 import org.nl.b_lms.sch.tasks.TwoOutTask;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
@@ -1051,6 +1052,45 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         }
     }
 
+    @Override
+    @Transactional
+    public String taskExceptionalOut(JSONObject jsonObject) {
+        // 任务表
+        WQLObject taskService = WQLObject.getWQLObject("sch_base_task");
+        // 仓位表
+        WQLObject attrTab = WQLObject.getWQLObject("ST_IVT_StructAttr");
+
+        JSONObject jsonTask = taskService.query("task_code = '" + jsonObject.getString("task_code") + "'").uniqueResult(0);
+
+        // 找出对应的浅货位
+        JSONObject jsonAttrOrder = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
+
+        JSONObject jsonAttrNow = attrTab.query("row_num = '" + jsonAttrOrder.getString("row_num") + "' AND layer_num = '" + jsonAttrOrder.getString("layer_num") + "' AND col_num = '" + jsonAttrOrder.getString("col_num") + "' and zdepth = '" + IOSEnum.ZDEPTH_STRUCT.code("浅") + "' and stor_id = '" + jsonAttrOrder.getString("stor_id") + "' and is_delete = '0' and is_used = '1'")
+                .uniqueResult(0);
+
+        if (ObjectUtil.isEmpty(jsonAttrNow)) {
+            throw new BadRequestException("对应浅货位不存在或未启用!" + jsonTask.getString("point_code1"));
+        }
+
+        // 锁住仓位
+        jsonAttrNow.put("lock_type", IOSEnum.LOCK_TYPE.code("货位异常出库锁"));
+        attrTab.update(jsonAttrNow);
+
+        // 生成任务
+        JSONObject taskParam = new JSONObject();
+        taskParam.put("start_device_code", jsonAttrNow.getString("struct_code"));
+        taskParam.put("next_device_code", IOSEnum.OUT_POINT.code(jsonAttrNow.getString("row_num")));
+        taskParam.put("task_type", "010712");
+        taskParam.put("car_no", "此货位LMS系统未有库存，请待出至【CK2001】点位后确认实物并重新手工入回库!");
+        taskParam.put("vehicle_code",IOSEnum.IS_NOTANDYES.code("否"));
+
+        TwoExcepionalMoveTask taskBean = new TwoExcepionalMoveTask();
+        String task_id = taskBean.createTask(taskParam);
+        taskBean.immediateNotifyAcs(null);
+
+        return task_id;
+    }
+
     /**
      * 创建调拨入库单
      * @param disDaoList：出库分配明细集合

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java

@@ -339,6 +339,9 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                         jsonAttr = attrTab.query("sect_id = '" + jsonObject.getString("sect_id") + "' AND lock_type = '1' AND is_delete = '0' AND IFNULL( storagevehicle_code, '' ) = ''").uniqueResult(0);
                     } else {
                         //TODO jsonAttr = inBussManageService.getOneStruct(attrParam);
+                        if (ObjectUtil.isNotEmpty(whereJson.get("in_buss"))) {
+                            attrParam.put("move_block_num", MapUtil.getStr(whereJson, "move_block_num"));
+                        }
                         jsonAttr = twoInBussManageService.getOneStruct(attrParam);
                     }
                 } else {

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java

@@ -379,6 +379,9 @@ public class InBussManageServiceImpl implements InBussManageService {
                         .eq(StIvtIostorinvdtl::getIostorinvdtl_id, disList.get(0).get("iostorinvdtl_id"))
         ).get(0);
 
+        // 获取当前巷道
+        JSONObject jsonAttr = attrTab.query("struct_code = '" + taskDao.getPoint_code2() + "'").uniqueResult(0);
+
         JSONObject jsonDiv = new JSONObject();
         jsonDiv.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao)));
         jsonDiv.put("tableMater", disList);
@@ -386,6 +389,8 @@ public class InBussManageServiceImpl implements InBussManageService {
         jsonDiv.put("is_send", IOSEnum.IS_SEND.code("否"));
         jsonDiv.put("sect_id", IOSEnum.SECT_ID.code("二期主存区"));
         jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonDiv.put("move_block_num", jsonAttr.getString("block_num"));
+        jsonDiv.put("in_buss", IOSEnum.IS_NOTANDYES.code("是"));
 
         iStIvtIostorinvService.divStruct(jsonDiv);
 

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

@@ -35,6 +35,7 @@ import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.enums.TASKEnum;
+import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.*;
 import org.nl.common.enums.NoticeTypeEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
@@ -83,7 +84,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AcsToWmsServiceImpl implements AcsToWmsService {
 
-    private static Interner<String> Heap_Lock = Interners.newWeakInterner();
+    private static Map<String,String> Task_Status_Convers = MapOf.of("1",TaskStatusEnum.EXECUTING.getCode(),"2",TaskStatusEnum.FINISHED.getCode(),"3","0");
 
 
     private final RawAssistIStorService rawAssistIStorService;
@@ -162,6 +163,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Autowired
     private ProductOutTwoService productOutTwoService;
 
+    @Autowired
+    private IStIvtIostorinvOutService iStIvtIostorinvOutService;
+
 
     /**
      * task_id：任务标识
@@ -185,38 +189,27 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
             try {
                 if (tryLock) {
-                    JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+                    JSONObject task = WQLObject.getWQLObject("SCH_BASE_Task")
+                            .query("task_id = '" + task_id + "'")
+                            .uniqueResult(0);
                     if (StrUtil.isNotEmpty(row.getString("car_no"))) {
-                        taskObj.put("car_no", row.getString("car_no"));
+                        WQLObject.getWQLObject("SCH_BASE_Task")
-                        WQLObject.getWQLObject("SCH_BASE_Task").update(taskObj);
+                                .update(MapOf.of("car_no",row.getString("car_no")),"task_id = '" + task_id + "'");
                     }
-                    // 任务处理类
+                    AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(task.getString("handle_class")));
-                    String processing_class = taskObj.getString("handle_class");
+                    abstractTask.updateTaskStatus(task,Task_Status_Convers.get(row.getString("task_status")));
-                    AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
-                    String status = "";
-                    if ("1".equals(row.getString("task_status"))) {
-                        status = TaskStatusEnum.EXECUTING.getCode();
-                    }
-                    if ("2".equals(row.getString("task_status"))) {
-                        status = TaskStatusEnum.FINISHED.getCode();
-                    }
-                    if ("3".equals(row.getString("task_status"))) {
-                        status = "0";
-                    }
-                    abstractTask.updateTaskStatus(taskObj,status);
                 } else {
                     throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
                 }
             }catch (Exception ex){
                 WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+row.getString("task_status")+"失败:"+ex.getMessage()),"task_id = '" + task_id + "'");
                 log.error(task_id+"acs更新任务失败:{}", ex);
-                throw new BadRequestException(ex.getMessage());
+                throw ex;
             }finally {
                 if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                     lock.unlock();
                 }
             }
-
         }
         JSONObject result = new JSONObject();
         result.put("status", HttpStatus.OK.value());
@@ -2260,40 +2253,40 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 // 判断任务类型
                 if (taskDao.getTask_type().equals(TASKEnum.BOX_TYPE.code("木箱入库"))) {
                     // 木箱入库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = inBoxManageService.taskExceptional(whereJson);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.BOX_TYPE.code("木箱出库"))) {
                     // 木箱出库：空出、浅货位有货-取货时
-                    if (type.equals("2")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         point_code = outBoxManageService.taskExceptional(whereJson);
                     }
-                    if (type.equals("3")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)"))) {
                         String task_id = outBoxManageService.taskExceptionalOut(whereJson);
                         result.put("task_id", task_id);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘入库"))) {
                     // 托盘入库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = inVehicleManageService.taskExceptional(whereJson);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.VEHICLE_TYPE.code("托盘出库"))) {
                     // 托盘出库：空出、浅货位有货-取货时
-                    if (type.equals("2")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         point_code = outVehicleManageService.taskExceptional(whereJson);
                     }
-                    if (type.equals("3")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)"))) {
                         String task_id = outVehicleManageService.taskExceptionalOut(whereJson);
                         result.put("task_id", task_id);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品入库"))) {
                     // 成品入库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = inBussManageService.taskExceptional(whereJson);
                     }
                 } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("成品出库"))) {
                     // 成品出库：空出
-                    if (type.equals("2")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         taskDao.setRemark("【空出】请检查货位库存!");
                         taskDao.setCar_no("【空出】请检查货位库存!");
                         taskService.updateById(taskDao);
@@ -2304,11 +2297,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         log.info("deviceApplyExceptional返回参数：---------------------------------------------" + result.toString());
                         return result;
                     }
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)"))) {
+                        // 浅货位阻挡-取货时
+                        String task_id = iStIvtIostorinvOutService.taskExceptionalOut(whereJson);
+                        result.put("task_id", task_id);
+                    }
                 } else if (taskDao.getTask_type().equals(TASKEnum.PROUD_TYPE.code("立库转库"))) {
                     // 立库转库：满入、浅货位有货-放货时
-                    if (type.equals("1") || type.equals("4")) {
+                    if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("入库满入")) || type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(入库)"))) {
                         point_code = outBussManageService.taskExceptional(whereJson);
-                    } else if (type.equals("2")) {
+                    } else if (type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("出库空出"))) {
                         // 立库转库空出
                         taskDao.setRemark("【空出】请检查货位库存!");
                         taskDao.setCar_no("【空出】请检查货位库存!");
@@ -2322,7 +2320,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     }
                 }
 
-                if (!type.equals("3") && ObjectUtil.isEmpty(point_code)) {
+                if (!type.equals(IOSEnum.ACS_EXCEPTIONAL_TYPE.code("浅货位有货(出库)")) && ObjectUtil.isEmpty(point_code)) {
                     throw new BadRequestException("立库异常任务处理失败，仓位为空!");
                 }