rev:更新组盘时的状态

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java

@@ -242,14 +242,16 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                 .set("remark", struct_code + "出库阻挡二次下发")
                 .set("update_time", DateUtil.now())
                 .eq("task_code", task_code));
+        StIvtStructattr struct = iStIvtStructattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", struct_code));
+        String vehicleCode = struct.getVehicle_code();
         RedissonUtils.lock(() -> {
             System.out.println("---3--" + Thread.currentThread().getName());
-            Map process = SpringContextHolder.getBean(DecisionHandler.class).dispenseTransa(ListOf.of("nearby"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code())));
+            Map process = SpringContextHolder.getBean(DecisionHandler.class).dispenseTransa(ListOf.of("nearby","depthPriority"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code())));
             moveStruct.set(((Map<String, String>) process.get("form_data")).get("end_struct_code"));
         }, "1" + stIvtStructattr.getStor_code(), 5);
         Map moveForm = MapOf.of("task_type", StatusEnum.IOBILL_TYPE_MOVE.code("异常位移库")
                 , "is_send", false
-                , "vehicle_code", "YCZJ" + task_code, "form_data", new JSONObject(MapOf.of("start_struct_code", struct_code, "end_struct_code", moveStruct.get())));
+                , "vehicle_code", StringUtils.isEmpty(vehicleCode)?"YCZJ" + task_code:vehicleCode, "form_data", new JSONObject(MapOf.of("start_struct_code", struct_code, "end_struct_code", moveStruct.get())));
         moveStorageTask.createTask(new JSONObject(moveForm));
     }
 
@@ -271,12 +273,15 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                 .set("point_code2", new_struct_code)
                 .set("remark", struct_code + "入满异常重新分配货位" + new_struct_code)
                 .eq("task_code", task_code));
-        iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
-                .eq("struct_code", struct_code)
-                .set("lock_type", StatusEnum.LOCK.code("异常锁定"))
-                .set("update_time", DateUtil.now())
-                .set("remark", "入满异常:" + task_code)
-                .set("vehicle_code", "YCZJ" + task_code));
+        StIvtStructattr struct = iStIvtStructattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", struct_code));
+        if (StringUtils.isEmpty(struct.getVehicle_code())){
+            iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
+                    .eq("struct_code", struct_code)
+                    .set("lock_type", StatusEnum.LOCK.code("异常锁定"))
+                    .set("update_time", DateUtil.now())
+                    .set("remark", "入满异常:" + task_code)
+                    .set("vehicle_code", "YCZJ" + task_code));
+        }
         JSONObject result = new JSONObject();
         result.put("point_code2", new_struct_code);
         return result;

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java

@@ -57,7 +57,6 @@ public abstract class FlowNodeActivityBehavior<T> {
                         .set("form_type", entity.getForm_type())
                         .set("aux_param", entity.getAuxParam().toString())
                         .set("form_id", entity.getForm_id())
-                        .set("remark", "")
                         .set("status", StatusEnum.FLOW_STATUS.code("启动"))
                         .set("form_data", entity.getT().toString())
                         .set("update_time", DateUtil.now()));

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/group/GroupController.java

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.RedissonUtils;
 import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
 import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
 import org.nl.wms.base_manage.material.service.dto.MaterialQuery;
@@ -92,22 +93,24 @@ public class GroupController {
 
     /**
      * 手持物料组盘操作
-     * @param form
+     * @param jform
      * @return
      */
     @PostMapping("in")
     @SaIgnore
     @Log("手持物料组盘操作")
     public ResponseEntity<TableDataInfo> inStorage(@RequestBody JSONObject jform) {
-        MaterGroupDto form = jform.toJavaObject(MaterGroupDto.class);
-        Assert.noNullElements(new Object[]{form,form.getItem(),form.getStor_code()},"请求参数不能为空");
-        for (MaterItem item : form.getItem()) {
-            GroupItemData itemData = new GroupItemData();
-            itemData.setSingle_weight(item.getSingle_weight());
-            item.setForm_data(itemData);
-            item.setUnit_id("16");
-        }
-        iMdGruopDickService.groupDick((JSONObject) JSONObject.toJSON(form));
+        RedissonUtils.lock(()->{
+            MaterGroupDto form = jform.toJavaObject(MaterGroupDto.class);
+            Assert.noNullElements(new Object[]{form,form.getItem(),form.getStor_code()},"请求参数不能为空");
+            for (MaterItem item : form.getItem()) {
+                GroupItemData itemData = new GroupItemData();
+                itemData.setSingle_weight(item.getSingle_weight());
+                item.setForm_data(itemData);
+                item.setUnit_id("16");
+            }
+            iMdGruopDickService.groupDick((JSONObject) JSONObject.toJSON(form));
+        },"手持组盘入库",5);
         return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java

@@ -1,6 +1,7 @@
 package org.nl.wms.pm_manage.form_data.controller;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
@@ -26,6 +27,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequestMapping("/api/pmFormData")
+@SaIgnore
 public class PmFormDataController {
 
     @Autowired

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java

@@ -134,11 +134,11 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
     }
 
     @Override
-    public Page queryTree(FormDataQuery query, PageQuery pageQuery) {
+    public List<PmFormDataDto> queryTree(FormDataQuery query, PageQuery pageQuery) {
         Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
             page.setOrderBy("id DESC");
-            this.baseMapper.queryTree(query);
-        return page;
+        List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree(query);
+        return pmFormDataDtos;
     }