嘉耐代码修改

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PointUpdateUtil.java

@@ -13,30 +13,27 @@ import org.springframework.http.HttpStatus;
 
 public class PointUpdateUtil {
   public static void updatePoint(JSONArray arr) {
-        String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue();
+    String isConnect =
+        SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue();
     if (StrUtil.equals("0", isConnect)) {
       return;
     }
-        new Thread(() -> {
     try {
       WmsToAcsServiceImpl wmsToAcsServiceImpl = new WmsToAcsServiceImpl();
       JSONObject joo = wmsToAcsServiceImpl.queryPointStatus(arr);
       JSONArray pointarr = joo.getJSONArray("data");
-                //JSONArray pointarr =new JSONArray();
       WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");
       for (int i = 0; i < pointarr.size(); i++) {
         JSONObject pointjo = pointarr.getJSONObject(i);
-                    //String point_status = "00";
         String mode = pointjo.getString("mode");
         String point_status = "0" + pointjo.getString("move");
-                    //String vehicle_code = pointjo.getString("vehicle_code");
         String vehicle_code = pointjo.getString("barcode");
         String device_code = pointjo.getString("device_code");
-                    //物料类型
+        // 物料类型
         String weight = pointjo.getString("weight");
-                    //物料
+        // 物料
         String material_code = pointjo.getString("material");
-                    //将托盘类型123，改为 03，04，05,默认给01
+        // 将托盘类型123，改为 03，04，05,默认给01
         String pallet_type = "01";
         if (!StrUtil.equals("0", pointjo.getString("pallet_type"))) {
           pallet_type = "0" + (pointjo.getIntValue("pallet_type") + 2);
@@ -55,11 +52,8 @@ public class PointUpdateUtil {
         pointTable.update(pointObj);
       }
     } catch (Exception e) {
+
       e.printStackTrace();
     }
-        }).start();
-
   }
-
-
 }

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java

@@ -94,7 +94,7 @@ public class StructFindUtil {
             }
         }
         JSONObject result = new JSONObject();
-        // 木托盘区
+        // 木托盘区--RGV
         if (StrUtil.equals("05", area_type)) {
             result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "11")
                     .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0);

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql

@@ -350,8 +350,9 @@ IF 输入.flag = "11"
                     LEFT JOIN md_pb_vehicle vehicle ON vehicle.vehicle_code = point.vehicle_code
                     AND point.vehicle_code <> ''
                  WHERE
-                    point.lock_type = '00'
+                   point.point_status = '01'
-                    AND point.point_status = '01'
+                   and
+                   ( point.lock_type = '00' or point.lock_type = '01')
                       OPTION 输入.area_type <> ""
                            point.area_type = 输入.area_type
                       ENDOPTION

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

@@ -15,6 +15,8 @@ public interface AcsToWmsService {
      */
 
     Map<String, Object> receiveTaskFromAcs(Map jsonObject);
+
+    Map<String, Object> receiveTaskFromAcsTrancs(Map jsonObject);
     /**
      * ACS客户端--->WMS服务端
      * ACS机械手给WMS发送任务

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

@@ -32,6 +32,7 @@ import org.nl.wms.sch.service.dto.PointDto;
 import org.nl.wms.sch.service.dto.TaskDto;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,8 +56,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
   private final FmjToPackIngTask fmjToPackIngTask;
   private final VehicleService vehicleService;
 
+  @Autowired
+  private  AcsToWmsService acsToWmsService;
+
   @Override
   public Map<String, Object> receiveTaskFromAcs(Map jsonObject) {
+    String type = (String) jsonObject.get("type");
+    synchronized (type) {
+      return acsToWmsService.receiveTaskFromAcsTrancs(jsonObject);
+    }
+  }
+
+  @Override
+  @Transactional
+  public Map<String, Object> receiveTaskFromAcsTrancs(Map jsonObject) {
     log.debug("ACS的receiveTaskFromAcs请求参数为:" + jsonObject);
     String device_code = (String) jsonObject.get("device_code");
     String type = (String) jsonObject.get("type");
@@ -72,7 +85,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     }
     WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");
     WQLObject structivtTable = WQLObject.getWQLObject("st_ivt_structivt");
-    synchronized (type) {
+
     switch (type) {
         // 送料入库
       case "1":
@@ -186,11 +199,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
               JSONObject joo = new JSONObject();
               joo.put("qty", jsonObject.get("unqualified_qty"));
               joo.put("device_code", device_code);
+              try {
                 String record_id = PressureUtil.record(joo);
                 // 回传不合格记录
-                // Wms/api/produceTaskToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl();
                 WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl();
                 wmsToJnService.feedBackQualityInfo(record_id);
+              } catch (Exception e) {
+                log.info("回传MES记录不合格异常!");
+                e.printStackTrace();
+              }
             }
             break;
           }
@@ -241,25 +258,30 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
           jsonObject.put("vehicle_code", vehicle_code);
         }
         String task_id = sendMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject));
-          log.info("创建送料任务标识:"+task_id);
+        log.info("创建送料任务标识:" + task_id);
         // 假如是压制下料的几个位置  需要记录不合格数量
         if (StrUtil.equals(area_type, AreaEnum.YZQY.getCode())) {
           WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
           JSONObject groupInfo = groupTable.query("task_id='" + task_id + "'").uniqueResult(0);
           if (ObjectUtil.isEmpty(groupInfo)) {
-              log.info("判断送料任务标识异常:"+task_id);
+            log.info("判断送料任务标识异常:" + task_id);
 
             throw new BadRequestException("压制满料扫码组盘错误,任务标识:" + task_id);
           }
-            log.info("判断送料任务正常:"+task_id);
+          log.info("判断送料任务正常:" + task_id);
 
           JSONObject joo = new JSONObject();
           joo.put("qty", jsonObject.get("unqualified_qty"));
           joo.put("device_code", device_code);
+          try {
             String record_id = PressureUtil.record(joo);
             // 回传不合格记录
             WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl();
             wmsToJnService.feedBackQualityInfo(record_id);
+          } catch (Exception e) {
+            log.info("回传MES记录不合格异常!");
+            e.printStackTrace();
+          }
         }
 
         break;
@@ -411,7 +433,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     result.put("data", new JSONObject());
     return result;
   }
-  }
 
   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -436,7 +457,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     String qty = String.valueOf(jsonObject.get("qty"));
     // 产品编码
     String product_code = String.valueOf(jsonObject.get("product_code"));
-    // String material_code = (String) jsonObject.get("material_code");
     if (StrUtil.isEmpty(product_code)) {
       throw new BadRequestException("产品编号不能为空！");
     }
@@ -542,6 +562,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     }
     groubObj.put("vehicle_code", vehicle_code);
     WQLObject.getWQLObject("st_buss_vehiclegroup").insert(groubObj);
+
     jsonObject.put("type", "1");
     jsonObject.put("group_id", group_id);
     jsonObject.put("producetask_id", producetask_id);
@@ -596,12 +617,42 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         groupObj.put("update_optname", UserInfoUtil.getNickName());
         groupObj.put("update_time", DateUtil.now());
         groupTable.update(groupObj);
+      } else {
+        groupObj = new JSONObject();
+        // 压制下料找不到组盘信息，根据任务号补齐组盘信息
+        String start_area = taskobj.getString("start_area");
+        JSONObject requestParam = taskobj.getJSONObject("request_param");
+        if ("22".equals(start_area)) {
+          JSONObject materialObj =
+              WQLObject.getWQLObject("MD_ME_Material")
+                  .query("material_id='" + requestParam.getString("material_id") + "'")
+                  .uniqueResult(0);
+          groupObj.put("material_code", materialObj.getString("material_code"));
+          groupObj.put("material_name", materialObj.getString("material_name"));
+          groupObj.put("material_spec", materialObj.getString("material_spec"));
+          groupObj.put("group_id", requestParam.getString("group_id"));
+          groupObj.put("vehicle_code", vehicle_code);
+          groupObj.put("material_id", requestParam.getString("material_id"));
+          groupObj.put("producetask_id", requestParam.getString("producetask_id"));
+          groupObj.put("qty", requestParam.getString("qty"));
+          groupObj.put("is_full", requestParam.getString("is_full"));
+          groupObj.put("is_autopackage", "1");
+
+          groupObj.put("task_id", taskobj.getString("task_id"));
+          groupObj.put("material_move_id", taskobj.getString("task_id"));
+
+          groupObj.put("create_id", UserInfoUtil.getCurrentUserId());
+          groupObj.put("create_name", UserInfoUtil.getNickName());
+          groupObj.put("create_time", DateUtil.now());
+          groupTable.insert(groupObj);
+
         } else {
           String msg = "未找到任务号为" + task_code + "的组盘信息";
           log.error(msg);
           throw new BadRequestException(msg);
         }
       }
+    }
 
     // 更新入库单单据的托盘条码
     WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
@@ -854,6 +905,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         wmsToJnServiceImpl.feedBackPackWordShop(map);
       }
     }
+    // 排产工单完成!
     if (StrUtil.equals("2", type)) {
       taskObj.put("producetask_status", "05");
       taskObj.put("real_qty", qty);
@@ -933,11 +985,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
           Class<?> clz = Class.forName(processing_class);
           AbstractAcsTask bean = (AbstractAcsTask) SpringContextHolder.getBean(clz);
           bean.updateTaskStatus(row, status);
-          //                    Object obj = clz.newInstance();
-          //                    // 调用每个任务类的forceFinishInst()强制结束方法
-          //                    Method m = obj.getClass().getDeclaredMethod("updateTaskStatus",
-          // JSONObject.class, String.class);
-          //                    m.invoke(obj, row, status);
         } catch (Exception e) {
           e.printStackTrace();
           message = e.getMessage();
@@ -1044,7 +1091,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             .query("point_code = '" + device_code + "'")
             .uniqueResult(0)
             .getString("vehicle_code");
-    //        WQLObject CribbingInfo_Table = WQLObject.getWQLObject("MD_ME_CribbingInfo");
     WQLObject group_table = WQLObject.getWQLObject("st_buss_vehiclegroup");
     // 从组盘表里面去获取组盘信息
     JSONObject result = group_table.query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0);

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/bindMaterial/service/impl/PdaBindingMaterialServiceImpl.java

@@ -27,7 +27,6 @@ public class PdaBindingMaterialServiceImpl implements PdaBindingMaterialService
     public Map<String, Object> queryInfoByVehicle(Map<String, String> jsonObject) {
         JSONObject returnjo = new JSONObject();
         String vehicle_code = (String) jsonObject.get("vehicle_code");
-        //JSONArray materialja = WQLObject.getWQLObject("st_buss_vehiclegroup").query("vehicle_code='"+vehicle_code+"'").getResultJSONArray(0);
         JSONObject materialja = WQL.getWO("QPADSERVICE").addParam("vehicle_code", vehicle_code).addParam("flag", "16").process().uniqueResult(0);
         returnjo.put("code", "1");
         returnjo.put("desc", "查询成功！");

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callEmpty/rest/CallEmptyController.java

@@ -2,14 +2,12 @@
 package org.nl.wms.pda.callEmpty.rest;
 
 
-import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.annotation.Log;
 import org.nl.wms.pda.callEmpty.service.CallEmptyService;
-import org.nl.wms.pda.sendMaterial.service.SendMaterialService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/rest/SendMaterialController.java

@@ -2,7 +2,6 @@
 package org.nl.wms.pda.sendMaterial.rest;
 
 
-import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/service/impl/SendMaterialServiceImpl.java

@@ -2,7 +2,6 @@ package org.nl.wms.pda.sendMaterial.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,24 +9,18 @@ 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.service.UserService;
 import org.nl.common.utils.UserInfoUtil;
+import org.nl.exception.BadRequestException;
 import org.nl.wms.WorkProcedureEnum;
-import org.nl.wms.database.service.MaterialService;
 import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl;
-import org.nl.wms.pda.sendMaterial.service.SendMaterialService;
 import org.nl.wms.pda.exception.PdaRequestException;
-import org.nl.wms.sch.manage.buss.FmjToPackIngTask;
+import org.nl.wms.pda.sendMaterial.service.SendMaterialService;
 import org.nl.wms.sch.manage.buss.SendMaterialTask;
 import org.nl.wql.core.bean.WQLObject;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.Map;
 
 @Service

wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java

@@ -1,7 +1,5 @@
-
 package org.nl.wms.pdm.service.impl;
 
-
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelReader;
@@ -52,14 +50,13 @@ import javax.servlet.http.HttpServletRequest;
  * @author geng by
  * @description 服务实现
  * @date 2022-04-26
- **/
+ */
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class ProducetaskServiceImpl implements ProducetaskService {
 
-    @Autowired
+  @Autowired DeviceService deviceService;
-    DeviceService deviceService;
 
   @Override
   public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -89,7 +86,10 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     if (ObjectUtil.isNotEmpty(search)) {
       map.put("search", "%" + search + "%");
     }
-        JSONObject json = WQL.getWO("PDM_ProduceTask_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.create_time desc");
+    JSONObject json =
+        WQL.getWO("PDM_ProduceTask_01")
+            .addParamMap(map)
+            .pageQuery(WqlUtil.getHttpContext(page), "task.create_time desc");
     return json;
   }
 
@@ -114,7 +114,8 @@ public class ProducetaskServiceImpl implements ProducetaskService {
   @Override
   public ProducetaskDto findByCode(String code) {
     WQLObject wo = WQLObject.getWQLObject("pdm_mg_producetask");
-        JSONObject json = wo.query("is_delete = '0' and producetask_code ='" + code + "'").uniqueResult(0);
+    JSONObject json =
+        wo.query("is_delete = '0' and producetask_code ='" + code + "'").uniqueResult(0);
     if (ObjectUtil.isNotEmpty(json)) {
       return json.toJavaObject(ProducetaskDto.class);
     }
@@ -125,7 +126,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
   @Transactional(rollbackFor = Exception.class)
   public void create(ProducetaskDto dto) {
 
-        //编码唯一性校验
+    // 编码唯一性校验
     String producetask_code = dto.getProducetask_code();
     ProducetaskDto byCode = this.findByCode(producetask_code);
     // if (ObjectUtil.isNotEmpty(byCode)) throw new BadRequestException("编码已存在!");
@@ -134,12 +135,14 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     String nickName = UserInfoUtil.getNickName();
     String now = DateUtil.now();
 
-
     String material_id = dto.getMaterial_id().toString();
-        //根据物料去找木托盘类型
+    // 根据物料去找木托盘类型
-        JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id = '" + material_id + "'").uniqueResult(0);
+    JSONObject materialObj =
+        WQLObject.getWQLObject("md_me_material")
+            .query("material_id = '" + material_id + "'")
+            .uniqueResult(0);
     String vehicle_type = materialObj.getString("vehicle_type");
-        if (StrUtil.isEmpty(vehicle_type) || StrUtil.equals(vehicle_type,"0")) {
+    if (StrUtil.isEmpty(vehicle_type) || StrUtil.equals(vehicle_type, "0")) {
       throw new RuntimeException("木托盘类型不可为空！");
     }
     dto.setVehicle_type(vehicle_type);
@@ -163,9 +166,14 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     ProducetaskDto entity = this.findById(dto.getProducetask_id());
     if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
 
-        //编码唯一性校验
+    // 编码唯一性校验
     WQLObject wo = WQLObject.getWQLObject("pdm_mg_producetask");
-        String where = "is_delete = '0' and producetask_code = '" + dto.getProducetask_code() + "' and producetask_id != '" + dto.getProducetask_id() + "'";
+    String where =
+        "is_delete = '0' and producetask_code = '"
+            + dto.getProducetask_code()
+            + "' and producetask_id != '"
+            + dto.getProducetask_id()
+            + "'";
 
     JSONObject jsonObject = wo.query(where).uniqueResult(0);
     if (ObjectUtil.isNotEmpty(jsonObject)) {
@@ -180,7 +188,6 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     dto.setUpdate_optid(currentUserId);
     dto.setUpdate_optname(nickName);
 
-
     JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
     wo.update(json);
   }
@@ -205,14 +212,18 @@ public class ProducetaskServiceImpl implements ProducetaskService {
   public JSONArray getDevice(JSONObject param) {
     String workprocedure_id = param.getString("workprocedure_id");
     WQLObject wo = WQLObject.getWQLObject("pdm_base_device");
-        JSONArray arr = wo.query(" is_delete = '0' and workprocedure_id = '" + workprocedure_id + "'", "device_code").getResultJSONArray(0);
+    JSONArray arr =
+        wo.query(
+                " is_delete = '0' and workprocedure_id = '" + workprocedure_id + "'", "device_code")
+            .getResultJSONArray(0);
     return arr;
   }
 
   @Override
   public JSONArray getDevice1() {
     WQLObject wo = WQLObject.getWQLObject("pdm_base_device");
-        JSONArray arr = wo.query(" is_delete = '0' and is_work_device ='1'", "device_code").getResultJSONArray(0);
+    JSONArray arr =
+        wo.query(" is_delete = '0' and is_work_device ='1'", "device_code").getResultJSONArray(0);
     return arr;
   }
 
@@ -251,7 +262,10 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     JSONObject map = new JSONObject();
     map.put("flag", "2");
     map.put("device_id", device_id);
-        JSONObject json = WQL.getWO("PDM_ProduceTask_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "task.seq_no");
+    JSONObject json =
+        WQL.getWO("PDM_ProduceTask_01")
+            .addParamMap(map)
+            .pageQuery(WqlUtil.getHttpContext(page), "task.seq_no");
     return json;
   }
 
@@ -303,20 +317,41 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     WQLObject wo = WQLObject.getWQLObject("pdm_mg_producetask");
     String device_id = param.getString("device_id");
     WQLObject taskTable = WQLObject.getWQLObject("PDM_MG_produceTask");
-        JSONObject jo = taskTable.query("device_id='" + device_id + "' and producetask_status in ('02','03','04')").uniqueResult(0);
+    JSONObject jo =
+        taskTable
+            .query("device_id='" + device_id + "' and producetask_status in ('02','03','04')")
+            .uniqueResult(0);
     if (ObjectUtil.isNotEmpty(jo)) {
       throw new BadRequestException("该设备存在未完成的工单，不能下发！");
     }
 
     DeviceDto dto = deviceService.findById(Long.valueOf(device_id));
     JSONObject taskObj = new JSONObject();
-        //假如是包装的三台机械手，是将设备当作工单设备
+    // 假如是包装的三台机械手，是将设备当作工单设备
-        //假如是压机下料的机械手，则是将对接为当作工单设备
+    // 假如是压机下料的机械手，则是将对接为当作工单设备
-        if (StrUtil.equals(dto.getDevice_code(), "FJJXS1") || StrUtil.equals("FJJXS2", dto.getDevice_code()) || StrUtil.equals("FJJXS3", dto.getDevice_code())) {
+    if (StrUtil.equals(dto.getDevice_code(), "FJJXS1")
-            taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "3").addParam("producetask_id", producetask_id).process().uniqueResult(0);
+        || StrUtil.equals("FJJXS2", dto.getDevice_code())
+        || StrUtil.equals("FJJXS3", dto.getDevice_code())) {
+      taskObj =
+          WQL.getWO("PDM_ProduceTask_01")
+              .addParam("flag", "3")
+              .addParam("producetask_id", producetask_id)
+              .process()
+              .uniqueResult(0);
     } else {
-            taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0);
+      taskObj =
+          WQL.getWO("PDM_ProduceTask_01")
+              .addParam("flag", "4")
+              .addParam("producetask_id", producetask_id)
+              .process()
+              .uniqueResult(0);
     }
+    String product_code = taskObj.getString("product_code");
+    String material_code = taskObj.getString("material_code");
+    if (ObjectUtil.isEmpty(product_code)) {
+      throw  new BadRequestException("物料【"+material_code+"】的垛形参数未设置!");
+    }
+
     taskObj.put("product_type", "wms");
     WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
     JSONArray arr = new JSONArray();
@@ -328,6 +363,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     }
     JSONObject map = new JSONObject();
     String producetask_status = "02";
+    // 压机一
     if (StrUtil.equals(device_id, "1560189462410039296")) {
       producetask_status = "04";
     }
@@ -398,34 +434,44 @@ public class ProducetaskServiceImpl implements ProducetaskService {
     for (int i = 0; i < read.size(); i++) {
       List list = read.get(i);
       JSONObject param = new JSONObject();
-            //按照列获取
+      // 按照列获取
       param.put("producetask_id", IdUtil.getSnowflake(1, 1).nextId());
       param.put("producetask_code", CodeUtil.getNewCode("PRODUCE_CODE"));
       param.put("producetask_status", "01");
 
       String material_code = list.get(0).toString();
-            JSONObject json_material = wo_material.query("is_delete = '0' and material_code = '" + material_code + "'").uniqueResult(0);
+      JSONObject json_material =
+          wo_material
+              .query("is_delete = '0' and material_code = '" + material_code + "'")
+              .uniqueResult(0);
       if (ObjectUtil.isEmpty(json_material)) {
         throw new BadRequestException("第'" + (i + 2) + "'行,物料编码不存在");
       }
       param.put("material_id", json_material.getString("material_id"));
 
       String device_code = list.get(1).toString();
-            JSONObject json_device = wo_device.query("is_delete = '0' and device_code = '" + device_code + "'").uniqueResult(0);
+      JSONObject json_device =
+          wo_device
+              .query("is_delete = '0' and device_code = '" + device_code + "'")
+              .uniqueResult(0);
       if (ObjectUtil.isEmpty(json_device)) {
         throw new BadRequestException("第'" + (i + 2) + "'行,设备编码不存在");
       }
       param.put("device_id", json_device.getString("device_id"));
 
       String produceline_code = list.get(2).toString();
-            JSONObject json_produceline = wo_line.query("is_delete = '0' and produceline_code = '" + produceline_code + "'").uniqueResult(0);
+      JSONObject json_produceline =
+          wo_line
+              .query("is_delete = '0' and produceline_code = '" + produceline_code + "'")
+              .uniqueResult(0);
       if (ObjectUtil.isEmpty(json_produceline)) {
         throw new BadRequestException("第'" + (i + 2) + "'行,产线编码不存在");
       }
       param.put("produceline_id", json_produceline.getString("produceline_id"));
 
       String cust_code = list.get(3).toString();
-            JSONObject json_cust = wo_cust.query("is_delete = '0' and cust_code = '" + cust_code + "'").uniqueResult(0);
+      JSONObject json_cust =
+          wo_cust.query("is_delete = '0' and cust_code = '" + cust_code + "'").uniqueResult(0);
       if (ObjectUtil.isEmpty(json_cust)) {
         throw new BadRequestException("第'" + (i + 2) + "'行,客户编码不存在");
       }
@@ -461,10 +507,10 @@ public class ProducetaskServiceImpl implements ProducetaskService {
   }
 
   public boolean isLegalTime(String str) {
-        String formatTime = "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29) (20|21|22|23|[0-1][0-9]):[0-5][0-9]:[0-5][0-9]$";
+    String formatTime =
+        "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29) (20|21|22|23|[0-1][0-9]):[0-5][0-9]:[0-5][0-9]$";
     Pattern p = Pattern.compile(formatTime);
     Matcher m = p.matcher(str);
     return m.matches();
   }
-
 }

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

@@ -37,20 +37,19 @@ public class CallEmptyVehicleTask 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);
       HashMap map = new HashMap();
       map.put("bill_status", "40");
-            WQLObject.getWQLObject("st_buss_EmptyVehicleRecord").update(map, "task_uuid='" + jsonTask.getString("task_id") + "'");
+      WQLObject.getWQLObject("st_buss_EmptyVehicleRecord")
+          .update(map, "task_uuid='" + jsonTask.getString("task_id") + "'");
     }
 
     if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
@@ -59,15 +58,20 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
       jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
       jsonTask.put("update_time", DateUtil.now());
       jsonTask.put("remark", "任务执行完成");
-            ///审核单据
+      /// 审核单据
       HashMap map = new HashMap();
       map.put("bill_status", "50");
-            WQLObject.getWQLObject("st_buss_EmptyVehicleRecord").update(map, "task_uuid='" + jsonTask.getString("task_id") + "'");
+      WQLObject.getWQLObject("st_buss_EmptyVehicleRecord")
-            //解锁仓位，托盘信息，回写到点位上去
+          .update(map, "task_uuid='" + jsonTask.getString("task_id") + "'");
+      // 解锁仓位，托盘信息，回写到点位上去
       String vehicle_code = jsonTask.getString("vehicle_code");
-            //插入刚托盘木托盘表
+      // 插入刚托盘木托盘表
       String point_code = jsonTask.getString("next_point_code");
-            String area_type = WQLObject.getWQLObject("sch_base_point").query("point_code='" + point_code + "'").uniqueResult(0).getString("area_type");
+      String area_type =
+          WQLObject.getWQLObject("sch_base_point")
+              .query("point_code='" + point_code + "'")
+              .uniqueResult(0)
+              .getString("area_type");
       if (StrUtil.equals(area_type, AreaEnum.FJQY.getCode())) {
         JSONObject jo = new JSONObject();
         jo.put("device_code", point_code);
@@ -75,21 +79,25 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
         SortingUtil.record(jo);
       }
 
-
       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", "01");
       endpointObj.put("vehicle_code", vehicle_code);
       pointTab.update(endpointObj);
-            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);
       startPointObj.put("lock_type", "00");
       startPointObj.put("point_status", "00");
       startPointObj.put("vehicle_code", "");
       pointTab.update(startPointObj);
       taskTab.update(jsonTask);
     }
-
   }
 
   @Override
@@ -97,14 +105,22 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
   public void findStartPoint() {
     String task_status = TaskStatusEnum.SURE_END.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");
       String next_point_code = taskObj.getString("next_point_code");
-            //找一个合适的仓位
+      // 找一个合适的仓位
       WQLObject Recordtable = WQLObject.getWQLObject("sch_base_task");
-            JSONObject IosObj = Recordtable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
+      JSONObject IosObj =
+          Recordtable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
       if (ObjectUtil.isEmpty(IosObj)) {
         throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的单据！");
       }
@@ -115,8 +131,12 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
       if (ObjectUtil.isEmpty(inStructObj)) {
         throw new BadRequestException("未找到合适的仓位！");
       }
-            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);
       String workprocedure_code = workInfo.getString("workInfo");
       String workprocedure_id = workInfo.getString("workprocedure_id");
       WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
@@ -129,7 +149,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
           vehicle_type = VehicleTypeEnum.GTP.getCode();
           start_area = AreaEnum.KTTDDQ.getCode();
 
-                    //分拣工序
+          // 分拣工序
         case FJGX:
           vehicle_type = VehicleTypeEnum.MTP.getCode();
           start_area = AreaEnum.MTPQ.getCode();
@@ -137,39 +157,36 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
           vehicle_type = VehicleTypeEnum.LZ.getCode();
           start_area = AreaEnum.KTTDDQ.getCode();
       }
-            //寻找一个合适的仓位
+      // 寻找一个合适的仓位
       JSONObject outStructObj = StructFindUtil.getEmptyVehicleOutStruct(param);
       if (ObjectUtil.isEmpty(outStructObj)) {
         continue;
       }
       String start_point_code = outStructObj.getString("struct_code");
       String vehicle_code = outStructObj.getString("vehicle_code");
-            //修改单据状态，将终点填入
+      // 修改单据状态，将终点填入
       IosObj.put("bill_status", "20");
       IosObj.put("start_point_code", start_point_code);
       IosObj.put("vehicle_code", vehicle_code);
       IosObj.put("start_area", start_area);
       Recordtable.update(IosObj);
 
-            //起点加锁
+      // 起点加锁
       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 + "'");
+      // 修改任务状态
       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());
       return;
-
     }
   }
 
   @Override
-    public void findNextPoint() {
+  public void findNextPoint() {}
-
-
-    }
 
   @Override
   public JSONObject renotifyAcs(String task_id) {
@@ -178,9 +195,9 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
 
   @Override
   public String createTask(JSONObject form) {
-        //请求参数 终点不能为空  起点点位为空时，托盘类型不能为空，托盘不能为空！
+    // 请求参数 终点不能为空  起点点位为空时，托盘类型不能为空，托盘不能为空！
     String next_point_code = form.getString("next_point_code");
-        //默认给一个测试托盘
+    // 默认给一个测试托盘
     String vehicle_code = "999";
     String is_auto_issue = "1";
     if (StrUtil.isEmpty(next_point_code)) {
@@ -189,18 +206,28 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
     String start_point_code = form.getString("start_point_code");
     String vehicle_type = form.getString("vehicle_type");
     WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
-        //判断起点有没有未完成的指令
+    // 判断起点有没有未完成的指令
-        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") + "' 未完成！");
     }
     String start_area = "";
-        //假如起点为空，根据终点点去找对应工序需要的托盘类型
+    // 假如起点为空，根据终点点去找对应工序需要的托盘类型
     if (StrUtil.isEmpty(start_point_code)) {
-            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);
       String workprocedure_id = workInfo.getString("workprocedure_id");
       String device_id = workInfo.getString("device_id");
       WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
@@ -209,19 +236,24 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
         case YZGX:
           vehicle_type = VehicleTypeEnum.GTP.getCode();
           start_area = AreaEnum.KTTDDQ.getCode();
-                    start_point_code="KTPDDW5";
+          start_point_code = "KTPDDW5";
           break;
-                //分拣工序
+          // 分拣工序
         case FJGX:
-                    //托盘类型取的物料对应的木托盘类型
+          // 托盘类型取的物料对应的木托盘类型
-                    JSONObject produceObj = WQLObject.getWQLObject("PDM_MG_produceTask").query("device_id='" + device_id + "' and producetask_status in('03','04')").uniqueResult(0);
+          JSONObject produceObj =
+              WQLObject.getWQLObject("PDM_MG_produceTask")
+                  .query("device_id='" + device_id + "' and producetask_status in('02','03','04')")
+                  .uniqueResult(0);
+          if (ObjectUtil.isEmpty(produceObj))
+            throw new BadRequestException("设备未设置工单或者工单状态不正确，请检查LMS设备工单状态!");
           vehicle_type = produceObj.getString("vehicle_type");
           start_area = AreaEnum.MTPQ.getCode();
           is_auto_issue = "0";
           break;
-                //叠盘工序
+          // 叠盘工序
         case DPGX:
-                    //托盘类型取的物料对应的木托盘类型
+          // 托盘类型取的物料对应的木托盘类型
           vehicle_type = VehicleTypeEnum.GTP.getCode();
           start_area = AreaEnum.KTTHCQ.getCode();
           break;
@@ -230,12 +262,12 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
           start_area = AreaEnum.KTTHCQ.getCode();
       }
       JSONObject param = new JSONObject();
-            //如果托盘类型不是02，则需要加上托盘类型
+      // 如果托盘类型不是02，则需要加上托盘类型(木托盘)
       if (!StrUtil.equals(vehicle_type, "02")) {
         param.put("vehicle_type", vehicle_type);
       }
       param.put("area_type", start_area);
-            param.put("point_code",start_point_code);
+      param.put("point_code", start_point_code);
 
       JSONObject outStructObj = StructFindUtil.getEmptyVehicleOutStruct(param);
       if (ObjectUtil.isEmpty(outStructObj)) {
@@ -246,10 +278,10 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
       if (StrUtil.isEmpty(vehicle_code)) {
         vehicle_code = "999";
       }
-            //如果是托盘区域/生成一个该类型的托盘
+      // 如果是托盘区域/生成一个该类型的托盘
       if (StrUtil.equals(workInfo.getString("area_type"), AreaEnum.FJQY.getCode())) {
         vehicle_code = CodeUtil.getNewCode("VEHICCLE_CODE_MTP");
-                //将托盘插入托盘表
+        // 将托盘插入托盘表
         WQLObject wo = WQLObject.getWQLObject("MD_PB_Vehicle");
         JSONObject jo = new JSONObject();
         VehicleDto dto = new VehicleDto();
@@ -271,20 +303,21 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
     }
     PointService pointService = SpringContextHolder.getBean(PointService.class);
     PointDto nextPoint = pointService.findByCode(next_point_code);
-        //生成空托盘搬运的单据
+    // 生成空托盘搬运的单据
     String task_status = TaskStatusEnum.SURE_END.getCode();
     String bill_status = "10";
     if (StrUtil.isNotEmpty(start_point_code)) {
-//            PointDto startPoint = pointService.findByCode(start_point_code);
+      //            PointDto startPoint = pointService.findByCode(start_point_code);
       bill_status = "20";
       task_status = TaskStatusEnum.START_AND_POINT.getCode();
-            //锁定起点
+      // 锁定起点
       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 + "'");
     }
     String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
-        //生成空载具搬运单据
+    // 生成空载具搬运单据
     JSONObject EmptyVehicleObj = new JSONObject();
     EmptyVehicleObj.put("record_uuid", IdUtil.getSnowflake(1, 1).nextId());
     EmptyVehicleObj.put("bill_code", CodeUtil.getNewCode("KZJ_BILL_CODE"));
@@ -300,7 +333,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
     EmptyVehicleObj.put("create_time", DateUtil.now());
     EmptyVehicleObj.put("is_delete", "0");
     WQLObject.getWQLObject("st_buss_EmptyVehicleRecord").insert(EmptyVehicleObj);
-        //生成任务
+    // 生成任务
     JSONObject taskObj = new JSONObject();
     taskObj.put("task_id", task_id);
     taskObj.put("task_code", IdUtil.getSnowflake(1, 1).nextId() + "");
@@ -326,17 +359,16 @@ public class CallEmptyVehicleTask 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/StructToConveyorTask.java

@@ -8,9 +8,8 @@ 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.sch.manage.AbstractAcsTask;
@@ -22,7 +21,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;
 
@@ -157,16 +155,11 @@ public class StructToConveyorTask extends AbstractAcsTask {
     }
 
     @Override
-    @Transactional
     public String createTask(JSONObject form) {
         //请求参数 载具、起点  物料，数量，客户,批次，创建方式 是否满托不能为空！ 终点可以不为空时，入库单据编号不能为空
         String vehicle_code = form.getString("vehicle_code");
         String start_point_code = form.getString("start_point_code");
         String next_point_code = form.getString("next_point_code");
-        String material_id = form.getString("material_id");
-        String is_full = form.getString("is_full");
-        String qty = form.getString("qty");
-        String pcsn = form.getString("pcsn");
         WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
 
         if (StrUtil.isEmpty(start_point_code)) {
@@ -182,29 +175,7 @@ public class StructToConveyorTask extends AbstractAcsTask {
         if (ObjectUtil.isNotEmpty(beforTaskObj)) {
             throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
         }
-        String is_autopackage = "1";
-        if (StrUtil.equals(start_point_code, "MDJXS601")) {
-            is_autopackage = "0";
-        }
         String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
-        JSONObject materialObj = WQLObject.getWQLObject("md_me_material").query("material_id='" + material_id + "'").uniqueResult(0);
-     /*   //组盘
-        JSONObject jo = new JSONObject();
-        String group_id = IdUtil.getSnowflake(1, 1).nextIdStr();
-        jo.put("group_id", group_id);
-        jo.put("material_id", material_id);
-        jo.put("material_code", materialObj.getString("material_code"));
-        jo.put("material_name", materialObj.getString("material_name"));
-        jo.put("vehicle_code", vehicle_code);
-        jo.put("is_autopackage", is_autopackage);
-        jo.put("pcsn", pcsn);
-        jo.put("qty", qty);
-        jo.put("create_id",UserInfoUtil.getCurrentUserId());
-        jo.put("create_name",UserInfoUtil.getNickName());
-        jo.put("create_time",DateUtil.now());
-        jo.put("task_id",task_id);
-        WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
-        groupTable.insert(jo);*/
 
         PointService pointService = SpringContextHolder.getBean(PointService.class);
         PointDto startPoint = pointService.findByCode(start_point_code);

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

@@ -102,7 +102,9 @@ public class AutoCreateTask {
             taskList.forEach(item -> {
                 JSONObject taskObj = new JSONObject();
                 taskObj.put("task_id", item.getExt_task_uuid());
-                taskObj.put("task_status", TaskStatusEnum.ISSUE.getCode());
+                //下发失败,改状态为了重新下发
+                taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
+//                taskObj.put("task_status", TaskStatusEnum.ISSUE.getCode());
                 taskObj.put("remark", "下发失败:" + message);
                 taskObj.put("update_time", DateUtil.now());
                 taskTab.update(taskObj);
@@ -115,6 +117,9 @@ public class AutoCreateTask {
                 JSONObject taskObj = errArr.getJSONObject(i);
                 JSONObject param=new JSONObject();
                 param.put("remark", "下发失败:"+taskObj.getString("message"));
+                //下发失败,改状态为了重新下发
+                param.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
+
                 param.put("update_time", DateUtil.now());
                 taskTab.update(param,"task_code = '"+taskObj.getString("task_code")+"'");
             }

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

@@ -60,7 +60,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">

wms/qd/src/views/login.vue

@@ -46,7 +46,7 @@ import { encrypt } from '@/utils/rsaEncrypt'
 import Config from '@/settings'
 import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
-import Background from '@/assets/images/background2.jpg'
+import Background from '@/assets/images/background.jpg'
 export default {
   name: 'Login',
   data() {

wms/qd/src/views/wms/pdm/produceTask/index.vue

@@ -257,7 +257,7 @@
             {{ dict.label.PRODUCETASK_STATUS[scope.row.producetask_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="material_name" label="物料名称" />
+        <el-table-column prop="material_name" label="物料名称"  min-width	="150" show-overflow-tooltip/>
         <el-table-column prop="device_name" label="设备名称" width="120" />
         <el-table-column v-if="false" prop="cust_name" label="客户名称" />
         <el-table-column prop="plan_qty" label="计划生产数量" width="120" />
@@ -268,7 +268,7 @@
         <el-table-column prop="print_type" label="打印名称" width="150" />
         <el-table-column prop="print_dm" label="打印使用单位" width="150" />
         <el-table-column prop="print_name" label="打印物料名称" width="150" />
-        <el-table-column prop="print_gg" label="打印物料规格" width="150" />
+        <el-table-column prop="print_gg" label="打印物料规格" min-width	="150" show-overflow-tooltip/>
         <el-table-column prop="print_pc" label=" 打印 批次" width="150" />
         <el-table-column prop="print_type" label="打印名称" width="150" />
         <el-table-column prop="yh_name" label="客户单位" width="150" />
@@ -300,14 +300,21 @@
         <el-table-column v-if="false" prop="update_optname" label="修改者" />
         <el-table-column v-if="false" prop="update_time" label="修改时间" width="150" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
+          <!--<template slot-scope="scope">
             <udOperation
               :data="scope.row"
               :permission="permission"
               :disabled-edit="scope.row.producetask_status !== '01'"
               :disabled-dle="scope.row.producetask_status !== '01'"
             />
+          </template>-->
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
           </template>
+
         </el-table-column>
       </el-table>
       <!--分页组件-->