修改

lms/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java

@@ -29,7 +29,11 @@ public class SecurityUtils {
                 return json.toBean(CurrentUser.class);
             }
         } catch (Exception e) {
-            return new CurrentUser();
+            CurrentUser currentUser = new CurrentUser();
+            currentUser.setId("2");
+            currentUser.setPresonName("外部系统用户");
+            currentUser.setUsername("default");
+            return currentUser;
         }
         return null;
     }

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

@@ -32,7 +32,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -208,7 +210,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 throw new BadRequestException("未查询到木箱：" + vehicle_code + "相关入库分配明细记录！");
             }
             Map map = new HashMap();
-            map.put("tableMater", dis_rows);
+            ArrayList<String> list = (ArrayList<String>) JSONObject.parseArray(dis_rows.toJSONString(),String.class);
+            map.put("tableMater", list);
             map.put("point_code", device_code);
             map.put("checked", true);
             map.put("auto_issue", "1");

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java

@@ -19,6 +19,7 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.pda.st.service.CoolInService;
 import org.nl.wms.pda.st.service.ProductInstorService;
 import org.nl.wms.sch.manage.AbstractAcsTask;
+import org.nl.wms.sch.tasks.CutConveyorTask;
 import org.nl.wms.sch.tasks.InTask;
 import org.nl.wms.st.inbill.service.RawAssistIStorService;
 import org.nl.wms.st.inbill.service.StorPublicService;
@@ -45,6 +46,8 @@ public class ProductInstorServiceImpl implements ProductInstorService {
 
     private final StorPublicService storPublicService;
 
+    private final CutConveyorTask cutConveyorTask;
+
     @Override
     public JSONObject boxQuery(JSONObject whereJson) {
         String box_no = whereJson.getString("box_no");
@@ -88,6 +91,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
         //1-报废入库；2-生产入库；3-退货入库；4-拆分入库
         String option = whereJson.getString("option");
         String material_code = whereJson.getString("material_code");
+        String point_code = whereJson.getString("point_code");
         String is_virtual = whereJson.getString("is_virtual");
 
         ArrayList<HashMap> box_rows = (ArrayList<HashMap>) whereJson.get("box_jo");
@@ -154,6 +158,11 @@ public class ProductInstorServiceImpl implements ProductInstorService {
                 throw new BadRequestException("该木箱没有长宽高信息，无法入库，请到子卷包装关系中维护!");
             }
             //创建二楼去一楼的任务
+            JSONObject form = new JSONObject();
+            form.put("point_code1", point_code);
+            form.put("point_code2", "TBJ01");
+            form.put("task_type", "010507");
+            cutConveyorTask.createTask(form);
         } else {
             String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
             //直接分配虚拟区货位，并确认

lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java

@@ -258,6 +258,7 @@ public class CutConveyorTask extends AbstractAcsTask {
         json.put("acs_task_type", "5");
         tab.insert(json);
 
+        this.immediateNotifyAcs(null);
         return json.getString("task_id");
     }