rev:结构变更

mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java

@@ -77,6 +77,7 @@ public enum AcsTaskEnum {
 
     ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务"),
     ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务"),
+    ACS_TASK_TYPE_RT("8","RT车搬运任务"),
 
     AUTO_TASK_FINISHED_TYPE("1", "自动完成任务"),
     MANUAL_TASK_FINISHED_TYPE("2", "手动完成任务"),

mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.nl.common.enums.AcsTaskEnum;
 
 import java.util.Map;
 
@@ -18,7 +19,7 @@ import java.util.Map;
 @AllArgsConstructor
 public class PointEvent<T> extends PublishEvent {
 
-    private String type;
+    private AcsTaskEnum type;
     private String acs_task_type;
     private String point_code1;
     private String point_code3;

mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java

@@ -11,8 +11,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
-import org.springframework.http.HttpStatus;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 
 import java.util.ArrayList;
 import java.util.HashMap;

mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java

@@ -5,15 +5,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext_manage.acs.service.impl.AcsToWmsServiceImpl;
-import org.nl.wms.product_manage.sch.tasks.SpeMachinery.SpeEmpTask;
-import org.nl.wms.product_manage.sch.tasks.SpeMachinery.SpeFullTask;
-import org.nl.wms.product_manage.sch.tasks.WashMachineryTask;
-import org.nl.wms.product_manage.sch.tasks.plotter.PlotterCallEmptyTask;
-import org.nl.wms.product_manage.sch.tasks.wash.WashCallEmptyTask;
-import org.nl.wms.product_manage.sch.tasks.packageWrap.WrapCallMaterialTask;
-import org.nl.wms.product_manage.sch.tasks.packageWrap.WrapSendEmptyTask;
-import org.nl.wms.product_manage.sch.tasks.plotter.PlotterSendMaterialTask;
-import org.nl.wms.product_manage.sch.tasks.wash.WashSendMaterialTask;
+import org.nl.wms.scheduler_manage.service.extendtask.SpeMachinery.SpeEmpTask;
+import org.nl.wms.scheduler_manage.service.extendtask.SpeMachinery.SpeFullTask;
+import org.nl.wms.scheduler_manage.service.extendtask.WashMachineryTask;
+import org.nl.wms.scheduler_manage.service.extendtask.plotter.PlotterCallEmptyTask;
+import org.nl.wms.scheduler_manage.service.extendtask.wash.WashCallEmptyTask;
+import org.nl.wms.scheduler_manage.service.extendtask.packageWrap.WrapCallMaterialTask;
+import org.nl.wms.scheduler_manage.service.extendtask.packageWrap.WrapSendEmptyTask;
+import org.nl.wms.scheduler_manage.service.extendtask.plotter.PlotterSendMaterialTask;
+import org.nl.wms.scheduler_manage.service.extendtask.wash.WashSendMaterialQZTask;
+import org.nl.wms.scheduler_manage.service.extendtask.wash.WashSendMaterialTask;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.context.annotation.Configuration;
 
@@ -33,6 +34,7 @@ public class ConventConfig implements SmartLifecycle {
         AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_SEND_EMP, SpringContextHolder.getBean(WrapSendEmptyTask.class));
         AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WASH_FULL, SpringContextHolder.getBean(WashSendMaterialTask.class));
         AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WASH_EMP, SpringContextHolder.getBean(WashCallEmptyTask.class));
+        AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WASH_FULL_ERROR, SpringContextHolder.getBean(WashSendMaterialQZTask.class));
         System.out.println("初始化Task_Collent完成777"+AcsToWmsServiceImpl.Task_Collent.size());
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java

@@ -9,8 +9,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.jsonwebtoken.lang.Assert;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +19,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService;
 import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
 import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
-import org.nl.wms.mps.service.PersoncorrdeviceService;
+import org.nl.wms.mps_manage.other.service.PersoncorrdeviceService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
-import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
+import org.nl.wms.mps_manage.other.service.dto.PersoncorrdeviceDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java

@@ -7,7 +7,7 @@ import org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdev
 import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
-import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
+import org.nl.wms.mps_manage.other.service.dto.PersoncorrdeviceDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java

@@ -5,15 +5,14 @@ package org.nl.wms.ext_manage.acs.rest;
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.api.ResultCode;
 import org.nl.modules.common.exception.BizCoreException;
 import org.nl.wms.ext_manage.acs.service.AcsToWmsService;
-import org.nl.wms.product_manage.sch.tasks.TaskScheduleService;
-import org.nl.wms.product_manage.sch.tasks.WashMachineryTask;
+import org.nl.wms.scheduler_manage.service.extendtask.TaskScheduleService;
+import org.nl.wms.scheduler_manage.service.extendtask.WashMachineryTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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

@@ -22,10 +22,9 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext_manage.acs.service.AcsToWmsService;
 import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.service.TaskService;
-import org.nl.wms.product_manage.sch.service.dto.TaskDto;
-import org.nl.wms.product_manage.sch.tasks.WashMachineryTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.task.TaskService;
+import org.nl.wms.scheduler_manage.service.extendtask.WashMachineryTask;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/DeviceScreenController.java

@@ -14,12 +14,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController
+//@RestController
 @RequiredArgsConstructor
-@Api(tags = "设备监控大屏")
-@RequestMapping("/api/deviceScreen")
-@SaIgnore
-@Slf4j
+//@Api(tags = "设备监控大屏")
+//@RequestMapping("/api/deviceScreen")
+//@SaIgnore
+//@Slf4j
 public class DeviceScreenController {
     private final DeviceScreenService deviceScreenService;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java

@@ -1,7 +1,6 @@
 package org.nl.wms.ext_manage.sap.service.impl;
 
 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;
@@ -10,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.json.XML;
+import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
@@ -21,6 +21,8 @@ import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
 import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
+import org.nl.wms.mps_manage.deliveryorder.service.IPcsDeliveryOrderService;
+import org.nl.wms.mps_manage.deliveryorder.service.dao.PcsDeliveryOrder;
 import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService;
 import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +45,8 @@ public class WmsToSapServiceImpl implements WmsToSapService {
     private IMdCsCustomerbaseService customerbaseService;
     @Autowired
     private IMpsSaleOrderService saleOrderService;
+    @Autowired
+    private IPcsDeliveryOrderService pcsDeliveryOrderService;
 
     @Override
     public JSONObject getMater(JSONObject form) {
@@ -138,6 +142,7 @@ public class WmsToSapServiceImpl implements WmsToSapService {
             String material_code = row.getString("Matnr").replaceAll("^(0+)", "");
             //获取物料对应的物料标识
             MdMeMaterialbase mater_jo = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_code", material_code));
+            sale_jo.setMaterial_code(material_code);
             if (ObjectUtil.isEmpty(mater_jo)) {
                 sale_jo.setMaterial_id("");
                 sale_jo.setRemark("未查询到该销售订单对应的物料主数据：" + material_code);
@@ -172,6 +177,7 @@ public class WmsToSapServiceImpl implements WmsToSapService {
             sale_jo.setCreate_id(SecurityUtils.getCurrentUserId());
             sale_jo.setCreate_time(DateUtil.now());
             sale_jo.setCreate_name(SecurityUtils.getCurrentNickName());
+            sale_jo.setIs_delete("0");
             if (need_update) {
                 saleOrderService.updateById(sale_jo);
             } else {
@@ -250,74 +256,73 @@ public class WmsToSapServiceImpl implements WmsToSapService {
         for (int i = 0; i < item.size(); i++) {
             boolean need_update = false;
             JSONObject row = item.getJSONObject(i);
-            JSONObject deliver_jo = WQLObject.getWQLObject("pcs_delivery_order").query("deliver_code = '" + row.getString("Vbeln") + "' AND seq_no = '" + row.getString("Posnr") + "'").uniqueResult(0);
+            PcsDeliveryOrder deliver_jo = pcsDeliveryOrderService.getOne(new QueryWrapper<PcsDeliveryOrder>().eq("deliver_code", row.getString("Vbeln")).eq("seq_no", row.getString("Posnr")));
             if (ObjectUtil.isEmpty(deliver_jo)) {
-                deliver_jo = new JSONObject();
-                deliver_jo.put("deliver_id", IdUtil.getSnowflake(1, 1).nextId());
+                deliver_jo = new PcsDeliveryOrder();
+                deliver_jo.setDeliver_id(IdUtil.getStringId());
             } else {
                 need_update = true;
-                if (!deliver_jo.getString("status").equals("10")) {
+                if (deliver_jo.getStatus().equals("10")) {
                     continue;
                 }
             }
-            deliver_jo.put("deliver_code", row.getString("Vbeln"));
-            deliver_jo.put("seq_no", row.getString("Posnr"));
-            deliver_jo.put("deliver_type", row.getString("Lfart"));
+            deliver_jo.setDeliver_code(row.getString("Vbeln"));
+            deliver_jo.setSeq_no(row.getInteger("Posnr"));
+            deliver_jo.setDeliver_type(row.getString("Lfart"));
             String material_code = row.getString("Matnr").replaceAll("^(0+)", "");
             //获取物料对应的物料标识
             MdMeMaterialbase mater_jo = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_code", material_code));
+            deliver_jo.setMaterial_code(material_code);
             if (ObjectUtil.isEmpty(mater_jo)) {
-                deliver_jo.put("material_id", "0");
-                deliver_jo.put("is_success", "0");
-                deliver_jo.put("remark", "未查询到该交货单对应的物料主数据：" + material_code);
+                deliver_jo.setMaterial_id("");
+                deliver_jo.setIs_success("0");
+                deliver_jo.setRemark("未查询到该交货单对应的物料主数据：" + material_code);
                 err_num++;
             } else {
-                String material_id = mater_jo.getMaterial_id();
-                deliver_jo.put("material_id", material_id);
+                deliver_jo.setMaterial_id(mater_jo.getMaterial_id());
             }
-            deliver_jo.put("status", "10");
-            deliver_jo.put("delivery_qty", row.getString("Lfimg"));
+            deliver_jo.setStatus("10");
+            deliver_jo.setDelivery_qty(row.getBigDecimal("Lfimg"));
             String cust_code = row.getString("Kunnr");
             MdCsCustomerbase cust_jo = customerbaseService.getOne(new QueryWrapper<MdCsCustomerbase>().eq("cust_code", cust_code));
             if (ObjectUtil.isNotEmpty(cust_jo)) {
-                deliver_jo.put("cust_id", cust_jo.getCust_id());
-                deliver_jo.put("cust_code", cust_jo.getCust_code());
-                deliver_jo.put("cust_name", cust_jo.getCust_name());
+                deliver_jo.setCust_id(cust_jo.getCust_id());
+                deliver_jo.setCust_code(cust_jo.getCust_code());
+                deliver_jo.setCust_name(cust_jo.getCust_name());
             } else {
-                deliver_jo.put("is_success", "0");
-                deliver_jo.put("remark", "未查询到该交货单对应的客户信息：" + cust_code);
+                deliver_jo.setIs_success("0");
+                deliver_jo.setRemark("未查询到该交货单对应的客户信息：" + cust_code);
                 err_num++;
             }
             String unit_code = row.getString("Vrkme");
             MdPbMeasureunit unit_jo = mdPbMeasureunitService.getOne(new QueryWrapper<MdPbMeasureunit>()
                     .eq("unit_name", unit_code));            if (ObjectUtil.isEmpty(unit_jo)) {
-                deliver_jo.put("qty_unit_id", "0");
-                deliver_jo.put("remark", "未查询到该交货单对应的单位信息：" + unit_code);
+                deliver_jo.setQty_unit_id("");
+                deliver_jo.setRemark("未查询到该交货单对应的单位信息：" + unit_code);
                 err_num++;
             } else {
-                deliver_jo.put("qty_unit_id", unit_jo.getMeasure_unit_id());
+                deliver_jo.setQty_unit_id(unit_jo.getMeasure_unit_id());
             }
             String sale_code = row.getString("Vgbel");
             String seq_no = row.getString("Vgpos");
-            JSONObject sale_jo = WQLObject.getWQLObject("pcs_sale_order").query("sale_code = '" + sale_code + "' AND seq_no = '" + seq_no + "'").uniqueResult(0);
+            MpsSaleOrder sale_jo = saleOrderService.getOne(new QueryWrapper<MpsSaleOrder>()
+                    .eq("sale_code", sale_code)
+                    .eq("seq_no", seq_no));
             if (ObjectUtil.isEmpty(sale_jo)) {
-                deliver_jo.put("remark", "未查询到该交货单对应的销售订单：" + unit_code + "行号为：" + seq_no);
-                deliver_jo.put("is_success", "0");
+                deliver_jo.setRemark("未查询到该交货单对应的销售订单：" + unit_code + "行号为：" + seq_no);
+                deliver_jo.setIs_success("0");
             } else {
-                deliver_jo.put("sale_id", sale_jo.getString("sale_id"));
-                deliver_jo.put("sale_code", sale_jo.getString("sale_code"));
-                deliver_jo.put("sale_seq_no", sale_jo.getString("seq_no"));
+                deliver_jo.setSale_id(sale_jo.getSale_id());
+                deliver_jo.setSale_code( sale_jo.getSale_code());
+                deliver_jo.setSale_seq_no(Integer.valueOf(sale_jo.getSeq_no()));
             }
-            deliver_jo.put("create_id", SecurityUtils.getCurrentUserId());
-            deliver_jo.put("create_name", SecurityUtils.getCurrentNickName());
-            deliver_jo.put("create_time", DateUtil.now());
-            deliver_jo.put("update_optid", SecurityUtils.getCurrentUserId());
-            deliver_jo.put("update_optname", SecurityUtils.getCurrentNickName());
-            deliver_jo.put("update_time", DateUtil.now());
+            deliver_jo.setCreate_id(SecurityUtils.getCurrentUserId());
+            deliver_jo.setCreate_name(SecurityUtils.getCurrentNickName());
+            deliver_jo.setCreate_time(DateUtil.now());
             if (need_update) {
-                WQLObject.getWQLObject("pcs_delivery_order").update(deliver_jo);
+                pcsDeliveryOrderService.updateById(deliver_jo);
             } else {
-                WQLObject.getWQLObject("pcs_delivery_order").insert(deliver_jo);
+                pcsDeliveryOrderService.save(deliver_jo);
             }
         }
         if (err_num > 0) {

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java

@@ -2,6 +2,7 @@
 package org.nl.wms.masterdata_manage.master.controller.customer;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -12,15 +13,16 @@ import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService;
+import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase;
 import org.nl.wms.masterdata_manage.master.service.customer.dto.CustomerQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author ldjun
@@ -69,4 +71,20 @@ public class MdCsCustomerbaseController {
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @GetMapping("/selectList")
+    @SaIgnore
+    public ResponseEntity<Object> getSelectList() {
+        List<Map> selectList = new ArrayList<>();
+        List<MdCsCustomerbase> list = icustomerbaseService.list();
+        if (!CollectionUtils.isEmpty(list)){
+            list.forEach(cus->{
+                Map<String, String> item = new HashMap<>();
+                item.put("value",cus.getCust_code());
+                item.put("label",cus.getCust_name());
+                selectList.add(item);
+            });
+        }
+        return new ResponseEntity<>(TableDataInfo.build(selectList),HttpStatus.OK);
+    }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java

@@ -1,65 +0,0 @@
-
-package org.nl.wms.mps.rest;
-
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.mps.service.TeamcorrpersonService;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
-* @author geng by
-* @date 2022-05-26
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "班组人员维护管理")
-@RequestMapping("/api/teamcorrperson")
-@Slf4j
-public class TeamcorrpersonController {
-
-    private final TeamcorrpersonService teamcorrpersonService;
-
-    @GetMapping
-    @Log("查询班组人员维护")
-    //("查询班组人员维护")
-    //@PreAuthorize("@el.check('teamcorrperson:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(teamcorrpersonService.queryAll(whereJson, page), HttpStatus.OK);
-    }
-
-    @PostMapping("/getPersonIdByTeamId")
-    @Log("根据班组查询人员id")
-    //("根据班组查询人员id")
-    //@PreAuthorize("@el.check('teamcorrperson:list')")
-    public ResponseEntity<Object> getPersonIdByTeamId(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(teamcorrpersonService.getPersonIdByTeamId(param), HttpStatus.OK);
-    }
-
-    @PostMapping("/addPersons")
-    @Log("添加班组人员关系")
-    //("添加班组人员关系")
-    //@PreAuthorize("@el.check('teamcorrperson:list')")
-    public ResponseEntity<Object> addPersons(@RequestBody JSONObject param) {
-        teamcorrpersonService.addPersons(param);
-        return new ResponseEntity<>( HttpStatus.OK);
-    }
-
-    @Log("删除")
-    //("删除")
-    //@PreAuthorize("@el.check('workteam:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        teamcorrpersonService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java

@@ -1,85 +0,0 @@
-
-package org.nl.wms.mps.rest;
-
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.mps.service.WorkteamService;
-import org.nl.wms.mps.service.dto.WorkteamDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
-* @author geng by
-* @date 2022-05-25
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "班组管理")
-@RequestMapping("/api/workteam")
-@Slf4j
-public class WorkteamController {
-
-    private final WorkteamService workteamService;
-
-    @GetMapping
-    @Log("查询班组")
-    //("查询班组")
-    //@PreAuthorize("@el.check('workteam:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(workteamService.queryAll(whereJson,page),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增班组")
-    //("新增班组")
-    //@PreAuthorize("@el.check('workteam:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody WorkteamDto dto){
-        workteamService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改班组")
-    //("修改班组")
-    //@PreAuthorize("@el.check('workteam:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody WorkteamDto dto){
-        workteamService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除班组")
-    //("删除班组")
-    //@PreAuthorize("@el.check('workteam:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        workteamService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @GetMapping("/getClasssystem")
-    @Log("查询班制下拉")
-    //("查询班制下拉")
-    //@PreAuthorize("@el.check('workteam:list')")
-    public ResponseEntity<Object> getClasssystem(){
-        return new ResponseEntity<>(workteamService.getClasssystem(),HttpStatus.OK);
-    }
-
-    @PutMapping("/changeActive")
-    @Log("修改状态")
-    //("修改状态")
-    public ResponseEntity<Object> update(@RequestBody JSONObject json) {
-        workteamService.changeActive(json);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-}

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/PcsDeliveryOrder.java

@@ -48,6 +48,7 @@ public class PcsDeliveryOrder implements Serializable {
      * 物料标识
      */
     private String material_id;
+    private String material_code;
 
     /**
      * 状态

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/PersoncorrdeviceService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.mps.service;
+package org.nl.wms.mps_manage.other.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
+import org.nl.wms.mps_manage.other.service.dto.PersoncorrdeviceDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/ProduceshiftorderService.java

@@ -1,11 +1,11 @@
-package org.nl.wms.mps.service;
+package org.nl.wms.mps_manage.other.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.utils.api.CommonResult;
 import org.nl.wms.system_manage.service.user.dao.SysUser;
-import org.nl.wms.mps.service.dto.DeviceDto;
-import org.nl.wms.mps.service.dto.ProduceshiftorderDto;
+import org.nl.wms.mps_manage.other.service.dto.DeviceDto;
+import org.nl.wms.mps_manage.other.service.dto.ProduceshiftorderDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/TeamcorrpersonService.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.mps.service;
+package org.nl.wms.mps_manage.other.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/WorkOrderImportEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.mps.service;
+package org.nl.wms.mps_manage.other.service;
 
 import cn.hutool.core.util.StrUtil;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/WorkteamService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.mps.service;
+package org.nl.wms.mps_manage.other.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.mps.service.dto.WorkteamDto;
+import org.nl.wms.mps_manage.other.service.dto.WorkteamDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/DeviceDto.java

@@ -1,10 +1,8 @@
-package org.nl.wms.mps.service.dto;
+package org.nl.wms.mps_manage.other.service.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * 设备信息
  *

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/PersoncorrdeviceDto.java

@@ -1,9 +1,8 @@
-package org.nl.wms.mps.service.dto;
+package org.nl.wms.mps_manage.other.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/ProduceWorkorderDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.mps.service.dto;
+package org.nl.wms.mps_manage.other.service.dto;
 
 import lombok.Data;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/ProduceshiftorderDto.java

@@ -1,14 +1,12 @@
-package org.nl.wms.mps.service.dto;
+package org.nl.wms.mps_manage.other.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
 * @description /

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/TeamcorrpersonDto.java

@@ -1,9 +1,8 @@
-package org.nl.wms.mps.service.dto;
+package org.nl.wms.mps_manage.other.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/WorkteamDto.java

@@ -1,13 +1,11 @@
-package org.nl.wms.mps.service.dto;
+package org.nl.wms.mps_manage.other.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
 * @description /

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/impl/PersoncorrdeviceServiceImpl.java

@@ -1,8 +1,7 @@
 
-package org.nl.wms.mps.service.impl;
+package org.nl.wms.mps_manage.other.service.impl;
 
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,15 +10,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
  import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
  import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.mps.service.PersoncorrdeviceService;
-import org.nl.wms.mps.service.dto.PersoncorrdeviceDto;
+import org.nl.wms.mps_manage.other.service.PersoncorrdeviceService;
+import org.nl.wms.mps_manage.other.service.dto.PersoncorrdeviceDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/impl/ProduceshiftorderServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.mps.service.impl;
+package org.nl.wms.mps_manage.other.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -31,10 +31,10 @@ import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.nl.wms.system_manage.service.user.dto.CurrentUser;
 import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.mps.service.ProduceshiftorderService;
-import org.nl.wms.mps.service.WorkOrderImportEnum;
-import org.nl.wms.mps.service.dto.DeviceDto;
-import org.nl.wms.mps.service.dto.ProduceshiftorderDto;
+import org.nl.wms.mps_manage.other.service.ProduceshiftorderService;
+import org.nl.wms.mps_manage.other.service.WorkOrderImportEnum;
+import org.nl.wms.mps_manage.other.service.dto.DeviceDto;
+import org.nl.wms.mps_manage.other.service.dto.ProduceshiftorderDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/impl/TeamcorrpersonServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.mps.service.impl;
+package org.nl.wms.mps_manage.other.service.impl;
 
 
 import cn.hutool.core.map.MapUtil;
@@ -8,12 +8,11 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
  import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.mps.service.TeamcorrpersonService;
+import org.nl.wms.mps_manage.other.service.TeamcorrpersonService;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/impl/WorkteamServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.mps.service.impl;
+package org.nl.wms.mps_manage.other.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -19,8 +19,8 @@ import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.system_manage.service.user.dto.CurrentUser;
-import org.nl.wms.mps.service.WorkteamService;
-import org.nl.wms.mps.service.dto.WorkteamDto;
+import org.nl.wms.mps_manage.other.service.WorkteamService;
+import org.nl.wms.mps_manage.other.service.dto.WorkteamDto;
 
 
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/IMpsSaleOrderIcExtService.java

@@ -1,8 +1,7 @@
-package org.nl.wms.mps.service.orderExt;
+package org.nl.wms.mps_manage.other.service.orderExt;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.mps.service.orderExt.dao.MpsSaleOrderIcExt;
+import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java

@@ -1,4 +1,4 @@
-package org.nl.wms.mps.service.orderExt.dao;
+package org.nl.wms.mps_manage.other.service.orderExt.dao;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/mapper/MpsSaleOrderIcExtMapper.java

@@ -1,6 +1,6 @@
-package org.nl.wms.mps.service.orderExt.dao.mapper;
+package org.nl.wms.mps_manage.other.service.orderExt.dao.mapper;
 
-import org.nl.wms.mps.service.orderExt.dao.MpsSaleOrderIcExt;
+import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/mapper/xml/MpsSaleOrderIcExtMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.mps.service.orderExt.dao.mapper.MpsSaleOrderIcExtMapper">
+<mapper namespace="org.nl.wms.mps_manage.other.service.orderExt.dao.mapper.MpsSaleOrderIcExtMapper">
 
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/impl/MpsSaleOrderIcExtServiceImpl.java

@@ -1,12 +1,11 @@
-package org.nl.wms.mps.service.orderExt.impl;
+package org.nl.wms.mps_manage.other.service.orderExt.impl;
 
 import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.nl.wms.mps.service.orderExt.dao.MpsSaleOrderIcExt;
-import org.nl.wms.mps.service.orderExt.dao.mapper.MpsSaleOrderIcExtMapper;
-import org.nl.wms.mps.service.orderExt.IMpsSaleOrderIcExtService;
+import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt;
+import org.nl.wms.mps_manage.other.service.orderExt.dao.mapper.MpsSaleOrderIcExtMapper;
+import org.nl.wms.mps_manage.other.service.orderExt.IMpsSaleOrderIcExtService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java

@@ -1,12 +1,11 @@
-package org.nl.wms.mps.controller.oderExt;
+package org.nl.wms.mps_manage.saleorder.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.swagger.annotations.ApiOperation;
 import org.nl.common.anno.Log;
-import org.nl.wms.mps.service.orderExt.IMpsSaleOrderIcExtService;
-import org.nl.wms.mps.service.orderExt.dao.MpsSaleOrderIcExt;
+import org.nl.wms.mps_manage.other.service.orderExt.IMpsSaleOrderIcExtService;
+import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml

@@ -4,15 +4,11 @@
 
     <select id="pageQuery" resultType="java.util.Map">
         SELECT
-        der.aps_sale_code ,
-        SUBSTRING_INDEX(der.aps_sale_code, '-', 1) AS sale_code,
-        SUBSTRING_INDEX(der.aps_sale_code, '-', -1) AS seq_no,
-        der.aps_sale_type,der.aps_status,der.sale_type, der.material_id, der.material_code, der.product_area,
-        der.product_qty, der.sendout_qty, der.instor_qty,der.status, der.sale_qty, der.produce_seq,
-        der.cust_id, der.cust_code, der.cust_name, der.qty_unit_id, der.plandeliver_date, der.create_id,
-        der.create_name, der.create_time, der.audit_id, der.audit_time, der.audit_name, der.confirm_id,
-        der.confirm_name, der.confirm_time, der.is_delete, der.remark,
+        der.*,
+        SUBSTRING_INDEX(der.aps_sale_code, '-', 1) AS aps_sale_code,
+        SUBSTRING_INDEX(der.aps_sale_code, '-', -1) AS aps_seq_no,
         mater.material_name,
+        mater.material_spec,
         unit.unit_name AS qty_unit_name
         FROM
         mps_sale_order der
@@ -50,6 +46,7 @@
         der.create_name, der.create_time, der.audit_id, der.audit_time, der.audit_name, der.confirm_id,
         der.confirm_name, der.confirm_time, der.is_delete, der.remark,
         mater.material_name,
+        mater.material_spec,
         unit.unit_name AS qty_unit_name
         FROM
         mps_sale_order der

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java

@@ -15,6 +15,8 @@ import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService;
+import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService;
+import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
 import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService;
@@ -47,6 +49,8 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
     @Autowired
     private IMdMeMaterialbaseService materialbaseService;
     @Autowired
+    private IMdCsCustomerbaseService icustomerbaseService;
+    @Autowired
     private IMdPbClassstandardService classstandardService;
 
     @Override
@@ -90,10 +94,29 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
     @Override
     public void create(JSONObject form) {
         MpsSaleOrder mpsSaleOrder = form.toJavaObject(MpsSaleOrder.class);
+        MpsSaleOrder one = this.getOne(new QueryWrapper<MpsSaleOrder>()
+                .eq("sale_code", mpsSaleOrder.getSale_code())
+                .eq("seq_no", mpsSaleOrder.getSeq_no()));
+        if (one!=null){
+            throw new BadRequestException("当前订单明细已经存");
+        }
+        MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>()
+                .eq("material_code", mpsSaleOrder.getMaterial_code()));
+        if (material==null){
+            throw new BadRequestException("当前物料编号不存在");
+        }
+        mpsSaleOrder.setMaterial_id(material.getMaterial_id());
         mpsSaleOrder.setSale_id(IdUtil.getStringId());
+        mpsSaleOrder.setSale_type("01");
+        mpsSaleOrder.setProduct_area("A1");
+        mpsSaleOrder.setStatus("10");
         mpsSaleOrder.setCreate_id(SecurityUtils.getCurrentUserId());
         mpsSaleOrder.setCreate_name(SecurityUtils.getCurrentNickName());
         mpsSaleOrder.setCreate_time(DateUtil.now());
+        mpsSaleOrder.setIs_delete("0 ");
+        MdCsCustomerbase cust = icustomerbaseService.getOne(new QueryWrapper<MdCsCustomerbase>().eq("cust_code", mpsSaleOrder.getCust_code()));
+        mpsSaleOrder.setCust_id(cust.getCust_id());
+        mpsSaleOrder.setCust_name(cust.getCust_name());
         this.save(mpsSaleOrder);
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java

@@ -6,22 +6,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
-import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.MapOf;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
 import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService;
-import org.nl.wms.product_manage.sch.service.PointService;
+import org.nl.wms.scheduler_manage.service.task.PointService;
 import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java

@@ -17,7 +17,7 @@ import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.product_manage.sch.tasks.plotter.PlotterCallEmptyTask;
+import org.nl.wms.scheduler_manage.service.extendtask.plotter.PlotterCallEmptyTask;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java

@@ -3,7 +3,6 @@ package org.nl.wms.product_manage.controller.workorder;
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
@@ -14,8 +13,8 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.api.RestBusinessTemplate;
 import org.nl.common.utils.api.ResultCode;
 import org.nl.modules.common.exception.BizCoreException;
-import org.nl.wms.mps.service.ProduceshiftorderService;
-import org.nl.wms.mps.service.dto.DeviceDto;
+import org.nl.wms.mps_manage.other.service.ProduceshiftorderService;
+import org.nl.wms.mps_manage.other.service.dto.DeviceDto;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.springframework.data.domain.Pageable;
@@ -23,11 +22,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author qinx

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialTask.java

@@ -1,199 +0,0 @@
-package org.nl.wms.product_manage.sch.tasks.wash;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.nl.common.enums.AcsTaskEnum;
-import org.nl.common.enums.StatusEnum;
-import org.nl.common.enums.WorkerOrderEnum;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.RedissonUtils;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.system.util.CodeUtil;
-import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
-import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
-import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
-import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
-import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
-import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
-import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
-import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
-import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
-import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
-import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService;
-import org.nl.wms.storage_manage.productmanage.util.RuleUtil;
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/*
- * @author ZZQ
- * @Date 2023/6/16 08:40
- * 清洗机下料满料请求
- */
-@Service
-@Slf4j
-public class WashSendMaterialTask extends AbstractAcsTask {
-
-    @Autowired
-    private IStIvtStructattrService structattrService;
-    @Autowired
-    private DivRuleCpService divRuleCpService;
-    @Autowired
-    private IStIvtSectattrService sectattrService;
-    @Autowired
-    private IPdmProduceWorkorderService workorderService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private WashSendMaterialQZTask sendMaterialQZTask;
-    @Autowired
-    private WmsToAcsService wms;
-    @Autowired
-    private IStIvtIostorinvBcpService stIvtIostorinvBcpService; // 仓位服务
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateTaskStatus(JSONObject param, String status) {
-        stIvtIostorinvBcpService.taskOperate(param);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String createTask(JSONObject param) {
-        if (StringUtils.isEmpty(param.getString("weight"))||StringUtils.isEmpty(param.getString("vehicle_code"))){
-            return sendMaterialQZTask.createTask(param);
-        }else {
-            String start_point_code = param.getString("device_code");
-            PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
-                    .eq("workorder_code", param.getString("workorder_code"))
-                    .eq("is_delete", false)
-                    .lt("workorder_status",  WorkerOrderEnum.COMPLETE.getCode()));
-            Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code")));
-            //?刻字满料请求：可以存在多个任务？
-            List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
-                    .lt("task_status", StatusEnum.TASK_FINISH.getCode())
-                    .and(wa->wa
-                            .eq("point_code1", param.getString("device_code"))
-                            .or()
-                            .eq("point_code2", param.getString("device_code")))
-            );
-            if (!CollectionUtils.isEmpty(list)){
-                throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
-            }
-            // 查找任务状态
-            String taskdtl_id = IdUtil.getStringId();
-            JSONObject task = new JSONObject();
-            task.put("task_id", taskdtl_id);
-            task.put("task_name", AcsTaskEnum.REQUEST_WASH_FULL.getDesc());
-            task.put("task_type", AcsTaskEnum.REQUEST_WASH_FULL.getCode());
-            task.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
-            task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode());
-            task.put("material_id", order.getMaterial_id());
-            task.put("material_qty", param.getString("weight"));
-            task.put("vehicle_code", param.getString("vehicle_code"));
-            task.put("task_status", TaskStatusEnum.CREATED.getCode());
-            task.put("point_code1", start_point_code);
-            task.put("handle_class", this.getClass().getName());
-            task.put("is_delete", StatusEnum.STATUS_FLASE.getCode());
-            String currentUserId = SecurityUtils.getCurrentUserId();
-            task.put("create_id", currentUserId);
-            task.put("create_name", SecurityUtils.getCurrentNickName());
-            task.put("create_time", DateUtil.now());
-            task.put("priority", "1");
-            task.put("finished_type", "1");
-            task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode());
-            task.put("table_fk_id",order.getWorkorder_code());
-            SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class);
-            taskService.save(schBaseTask);
-            // 找终点
-            try {
-                RedissonUtils.lock(()->{
-                    pointConfirm(task);
-                    JSONArray data = new JSONArray();
-                    data.add(task);
-                    // 下发
-                    wms.issueTaskToAcs2(data);
-                },"banchengpin_ruku",2);
-            } catch (Exception ex) {
-                // 未找到
-                log.error("刻字满料请求异常,error:{}",ex);
-                schBaseTask.setRemark(ex.getMessage());
-                schBaseTask.setUpdate_time(new Date());
-                schBaseTask.setUpdate_name("acs");
-                schBaseTask.setTask_status(StatusEnum.TASK_START_ERROR.getCode());
-                taskService.save(schBaseTask);
-            }
-            return taskdtl_id;
-        }
-    }
-
-    @Override
-    public void cancel(String task_id) {
-        taskService.update(new UpdateWrapper<SchBaseTask>()
-                .set("task_status",StatusEnum.TASK_CANNEL.getCode())
-                .set("update_name","acs")
-                .set("update_time",DateUtil.now()).eq("task_id",task_id));
-    }
-
-    /**
-     * 满料请求
-     * 清洗机入半成品库
-     */
-    @Override
-    public void pointConfirm(JSONObject task) {
-
-            // 去刻字缓存区寻找空位
-            //分配货位。下发任务，更新主单据状态。更新明细任务
-            StIvtSectattr sect = sectattrService.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_name", "半成品库区"));
-            JSONObject jo = new JSONObject();
-            jo.put("sect_id", sect.getSect_id());
-            jo.put("stor_id", sect.getStor_id());
-            jo.put("rule_type", RuleUtil.PRODUCTION_IN_1);
-            StIvtStructattr stIvtStructattr = divRuleCpService.divRuleIn(jo);
-            //少出入库记录
-            if (ObjectUtil.isEmpty(stIvtStructattr)) {
-                throw new BadRequestException("无可分配货位");
-            }
-            // 设置点位
-            SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class);
-            schBaseTask.setTask_status(StatusEnum.TASK_START_END_P.getCode());
-            schBaseTask.setUpdate_time(new Date());
-            schBaseTask.setTask_type(AcsTaskEnum.TASK_STRUCT_IN.getCode());
-            taskService.updateById(schBaseTask);
-            structattrService.lockStruct(stIvtStructattr.getStruct_code(), "入库锁",schBaseTask.getTask_id());
-
-    }
-
-    @Override
-    public List<SchBaseTask> schedulerTask(List<SchBaseTask> tasks) {
-        ArrayList<SchBaseTask> Merge = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(tasks)){
-            for (SchBaseTask task : tasks) {
-                task.setTask_group_id(IdUtil.getStringId());
-                Merge.add(task);
-            }
-        }
-        return Merge;
-    }
-}

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWashorderService.java

@@ -1,8 +1,8 @@
-package org.nl.wms.product_manage.备份pdm;
+package org.nl.wms.product_manage.service.workorder;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
+import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWashorder;
 
 /**
  * <p>

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWashorder.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.备份pdm.dao;
+package org.nl.wms.product_manage.service.workorder.dao;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWashorderMapper.java

@@ -1,8 +1,8 @@
-package org.nl.wms.product_manage.备份pdm.dao.mapper;
+package org.nl.wms.product_manage.service.workorder.dao.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
+import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWashorder;
 
 /**
  * <p>

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWashorderMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.product_manage.备份pdm.dao.mapper.PdmProduceWashorderMapper">
+<mapper namespace="org.nl.wms.product_manage.service.workorder.dao.mapper.PdmProduceWashorderMapper">
 
 </mapper>

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml

@@ -6,7 +6,7 @@
         SELECT
         ShiftOrder.*,
         material.material_name,
-        material.material_code,
+        material.material_code as materialCode,
         material.material_spec,
         pdm_bi_device.outupperlimit_qty,
         pro.workprocedure_code,

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java

@@ -29,8 +29,8 @@ import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
 import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
-import org.nl.wms.mps.service.dto.ProduceshiftorderDto;
-import org.nl.wms.product_manage.ReportEnum;
+import org.nl.wms.mps_manage.other.service.dto.ProduceshiftorderDto;
+import org.nl.wms.scheduler_manage.ReportEnum;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/PdmProduceWashorderServiceImpl.java

@@ -1,10 +1,10 @@
-package org.nl.wms.product_manage.备份pdm.impl;
+package org.nl.wms.product_manage.service.workorder.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.product_manage.备份pdm.IPdmProduceWashorderService;
-import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
-import org.nl.wms.product_manage.备份pdm.dao.mapper.PdmProduceWashorderMapper;
+import org.nl.wms.product_manage.service.workorder.IPdmProduceWashorderService;
+import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWashorder;
+import org.nl.wms.product_manage.service.workorder.dao.mapper.PdmProduceWashorderMapper;
 import org.springframework.stereotype.Service;
 
 /**

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/ReportEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage;
+package org.nl.wms.scheduler_manage;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/point/SchBasePointController.java

@@ -4,11 +4,9 @@ package org.nl.wms.scheduler_manage.controller.point;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import io.swagger.annotations.ApiOperation;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.StatusEnum;
-import org.nl.wms.product_manage.sch.service.PointService;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.region.ISchBaseRegionService;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java

@@ -3,11 +3,10 @@ package org.nl.wms.scheduler_manage.controller.region;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.product_manage.sch.service.RegionService;
+import org.nl.wms.scheduler_manage.service.task.RegionService;
 import org.nl.wms.scheduler_manage.service.region.ISchBaseRegionService;
 import org.nl.wms.scheduler_manage.service.region.dao.SchBaseRegion;
 import org.springframework.beans.factory.annotation.Autowired;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
@@ -18,11 +17,10 @@ import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 import org.nl.wms.system_manage.service.dict.ISysDictService;
 import org.nl.wms.system_manage.service.dict.dao.Dict;
-import org.nl.wms.product_manage.sch.manage.FinishTypeEnum;
-import org.nl.wms.product_manage.sch.service.TaskService;
-import org.nl.wms.product_manage.sch.service.dto.TaskDto;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.FinishTypeEnum;
+import org.nl.wms.scheduler_manage.service.task.TaskService;
+import org.nl.wms.scheduler_manage.service.task.dto.TaskDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/AcsTaskDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks;
+package org.nl.wms.scheduler_manage.service.extendtask;
 
 import lombok.Data;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/CallMaterialTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks;
+package org.nl.wms.scheduler_manage.service.extendtask;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -12,10 +12,10 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.common.StructFindUtil;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
-import org.nl.wms.product_manage.sch.service.dto.PointDto;
-import org.nl.wms.product_manage.sch.service.impl.PointServiceImpl;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.task.dto.PointDto;
+import org.nl.wms.scheduler_manage.service.task.impl.PointServiceImpl;
 
 
 import org.springframework.stereotype.Service;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/PointListener.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch;
+package org.nl.wms.scheduler_manage.service.extendtask;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -9,7 +9,7 @@ import org.nl.common.publish.AbstraceListener;
 import org.nl.common.publish.event.PointEvent;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.system.util.CodeUtil;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,8 @@ public class PointListener extends AbstraceListener<PointEvent> {
         参数封装:{
             task.put("task_id", task_id);
             task.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
-            task.put("task_type", event.getType());
+            task.put("task_type", event.getType().getCode());
+            task.put("task_type", event.getType().getDesc());
             task.put("acs_task_type", event.getAcs_task_type());
             task.put("task_status", TaskStatusEnum.CREATED.getCode());
             task.put("point_code1", event.getPoint_code1());
@@ -43,6 +44,7 @@ public class PointListener extends AbstraceListener<PointEvent> {
             task.put("update_optname", SecurityUtils.getCurrentNickName());
             task.put("create_time", DateUtil.now());
             task.put("update_time", DateUtil.now());
+            task.put("is_auto_issue", "0");
             task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode());
             task.put("priority", "1");}
         taskService.save(task.toJavaObject(SchBaseTask.class));

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/ProductInTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks;
+package org.nl.wms.scheduler_manage.service.extendtask;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -12,8 +12,8 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.HashMap;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SendMaterialTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks;
+package org.nl.wms.scheduler_manage.service.extendtask;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -13,12 +13,12 @@ import org.nl.modules.system.util.CodeUtil;
 
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
 
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
-import org.nl.wms.product_manage.sch.service.PointService;
-import org.nl.wms.product_manage.sch.service.dto.PointDto;
-import org.nl.wms.product_manage.sch.service.impl.PointServiceImpl;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.task.PointService;
+import org.nl.wms.scheduler_manage.service.task.dto.PointDto;
+import org.nl.wms.scheduler_manage.service.task.impl.PointServiceImpl;
 
 
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SpeMachinery/SpeEmpTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks.SpeMachinery;
+package org.nl.wms.scheduler_manage.service.extendtask.SpeMachinery;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
@@ -20,8 +20,8 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.ext_manage.acs.service.impl.AgvInstService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SpeMachinery/SpeFullTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks.SpeMachinery;
+package org.nl.wms.scheduler_manage.service.extendtask.SpeMachinery;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
@@ -21,8 +21,8 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.ext_manage.acs.service.impl.AgvInstService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/TaskScheduleService.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks;
+package org.nl.wms.scheduler_manage.service.extendtask;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
@@ -13,12 +13,11 @@ import org.nl.common.utils.BaseCode;
 import org.nl.common.utils.IdUtil;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
@@ -48,7 +47,6 @@ public class TaskScheduleService {
     }
     @SneakyThrows
 //    @Scheduled(cron = "0/30 * * * * ?")
-    @Transactional(rollbackFor = Exception.class)
     public void taskPublish(){
         boolean islock = lock.tryLock();
         try {
@@ -63,7 +61,9 @@ public class TaskScheduleService {
                         SchBaseTask task =iterator.next();
                         try {
                             AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(task.getHandle_class()));
-                            taskHandler.pointConfirm((JSONObject) JSONObject.toJSON(task));
+                            if (taskHandler!=null){
+                                taskHandler.pointConfirm((JSONObject) JSONObject.toJSON(task));
+                            }
                         }catch (Exception ex){
                             task.setTask_status(StatusEnum.TASK_START_ERROR.getCode());
                             task.setRemark(ex.getMessage());

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/WashMachineryTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks;
+package org.nl.wms.scheduler_manage.service.extendtask;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -21,9 +21,9 @@ import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
-import org.nl.wms.product_manage.备份pdm.IPdmProduceWashorderService;
-import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
+import org.nl.wms.product_manage.service.workorder.IPdmProduceWashorderService;
+import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWashorder;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResourceLoader;
 import org.springframework.core.io.Resource;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/manage/AbstractAcsTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.manage;
+package org.nl.wms.scheduler_manage.service.extendtask.manage;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 
-import java.util.ArrayList;
 import java.util.List;
 
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/manage/AutoImportDeliverOrder.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.manage;
+package org.nl.wms.scheduler_manage.service.extendtask.manage;
 
 
 import com.alibaba.fastjson.JSONObject;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/manage/AutoImportSaleOrder.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.manage;
+package org.nl.wms.scheduler_manage.service.extendtask.manage;
 
 
 import com.alibaba.fastjson.JSONObject;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/manage/FinishTypeEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.manage;
+package org.nl.wms.scheduler_manage.service.extendtask.manage;
 
 /**
  * 完成方式:00自动,01:手动

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/manage/TaskStatusEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.manage;
+package org.nl.wms.scheduler_manage.service.extendtask.manage;
 
 /**
  * Task状态:00生成 ,01：下发，02、执行中，03、完成

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapCallMaterialTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks.packageWrap;
+package org.nl.wms.scheduler_manage.service.extendtask.packageWrap;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -19,7 +19,7 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
@@ -65,6 +65,10 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
             taskService.update(new UpdateWrapper<SchBaseTask>()
                     .set("task_status",StatusEnum.TASK_RUNNING.getCode()).set("update_time",new Date())
                     .eq("task_id",one.getTask_id()));
+            pointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type",StatusEnum.LOCK_OFF.getCode())
+                    .set("lock_type",StatusEnum.LOCK_ON.getCode())
+                    .set("task_id",one.getTask_id())
+                    .eq("point_code",one.getPoint_code1()).ne("task_id",one.getTask_id()));
         }
         if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
             // 完成
@@ -177,10 +181,6 @@ public class WrapCallMaterialTask extends AbstractAcsTask {
                 .gt("qty", 0));
         if (ObjectUtil.isNotEmpty(list)) {
             SchBasePoint schBasePoint = list.get(0);
-            pointService.update(new UpdateWrapper<SchBasePoint>()
-                    .set("lock_type",StatusEnum.LOCK_ON.getCode())
-                    .set("task_id",task.getString("task_id"))
-                    .eq("point_code",schBasePoint.getPoint_code()));
             // 设置点位
             task.put("update_time", DateUtil.now());
             task.put("point_code1",schBasePoint.getPoint_code());

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks.packageWrap;
+package org.nl.wms.scheduler_manage.service.extendtask.packageWrap;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -19,7 +19,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
@@ -61,6 +61,10 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
             taskService.update(new UpdateWrapper<SchBaseTask>()
                     .set("task_status",StatusEnum.TASK_RUNNING.getCode()).set("update_time",new Date())
                     .eq("task_id",task.getString("task_id")));
+            pointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type",StatusEnum.LOCK_OFF.getCode())
+                    .set("lock_type",StatusEnum.LOCK_ON.getCode())
+                    .set("task_id",one.getTask_id())
+                    .eq("point_code",one.getPoint_code3()).ne("task_id",one.getTask_id()));
 
         }
         if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
@@ -167,9 +171,6 @@ public class WrapSendEmptyTask extends AbstractAcsTask {
             // 找到位置
             // 点位上锁
             SchBasePoint point = list.get(0);
-            point.setLock_type(StatusEnum.LOCK_ON.getCode());
-            point.setTask_id(task.getString("task_id"));
-            pointService.updateById(point);
             // 设置点位
             task.put("update_time", DateUtil.now());
             task.put("point_code3",point.getPoint_code());

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterCallEmptyTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks.plotter;
+package org.nl.wms.scheduler_manage.service.extendtask.plotter;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -20,7 +20,7 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
@@ -68,6 +68,10 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
                     .set("task_status",StatusEnum.TASK_RUNNING.getCode())
                     .set("update_name","acs")
                     .set("update_time",DateUtil.now()).eq("task_id",task.getString("task_id")));
+            pointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type",StatusEnum.LOCK_OFF.getCode())
+                    .set("lock_type",StatusEnum.LOCK_ON.getCode())
+                    .set("task_id",one.getTask_id())
+                    .eq("point_code",one.getPoint_code1()));
         }
         if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
             // 完成
@@ -137,7 +141,7 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
             schBaseTask.setUpdate_time(new Date());
             schBaseTask.setUpdate_name("acs");
             schBaseTask.setTask_status(StatusEnum.TASK_START_ERROR.getCode());
-            taskService.save(schBaseTask);
+            taskService.updateById(schBaseTask);
         }
         return task.getString("task_id");
     }
@@ -193,9 +197,6 @@ public class PlotterCallEmptyTask extends AbstractAcsTask {
         );
         if (ObjectUtil.isNotEmpty(list)) {
             SchBasePoint point = list.get(0);
-            point.setLock_type(StatusEnum.LOCK_ON.getCode());
-            point.setTask_id(task.getString("task_id"));
-            pointService.updateById(point);
             // 设置点位
             task.put("update_time", DateUtil.now());
             task.put("point_code1",point.getPoint_code());

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/plotter/PlotterSendMaterialTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks.plotter;
+package org.nl.wms.scheduler_manage.service.extendtask.plotter;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -19,8 +19,8 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
@@ -60,25 +60,29 @@ public class PlotterSendMaterialTask extends AbstractAcsTask {
             throw new BadRequestException("任务已完成，不可取消!");
         }
         if (status.equals(AcsTaskEnum.STATUS_START.getCode())) {
+            pointService.update(new UpdateWrapper<SchBasePoint>().set("lock_type",StatusEnum.LOCK_OFF.getCode())
+                    .set("lock_type",StatusEnum.LOCK_ON.getCode())
+                    .set("task_id",one.getTask_id())
+                    .eq("point_code",one.getPoint_code3()));
             UpdateWrapper<SchBaseTask> updateWrapper = new UpdateWrapper<SchBaseTask>()
                     .set("task_status", StatusEnum.TASK_RUNNING.getCode())
                     .set("update_name", "acs")
                     .set("update_time", DateUtil.now()).eq("task_id", one.getTask_id());
             if (!("fall_finish"+one.getTask_id()).equals(one.getRemark())){
-                updateWrapper.set("remark","fall_finish"+one.getTask_id());
                 Map<String, String> extParam = (Map)param.get("ext_param");
                 String weight = extParam.get("weight");
                 if (StringUtils.isNotEmpty(weight) && Integer.valueOf(weight)>0){
+                    updateWrapper.set("remark","fall_finish"+one.getTask_id());
                     updateWrapper.set("material_qty",weight);
                 }
             }
+
             taskService.update(updateWrapper);
         }
         if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
             // 完成
             taskService.update(new UpdateWrapper<SchBaseTask>()
                     .set("task_status",StatusEnum.TASK_FINISH.getCode())
-                    .set("point_status",StatusEnum.POINT_STATUS_FULL.getCode())
                     .set("update_name","acs")
                     .set("update_time",DateUtil.now()).eq("task_id",one.getTask_id()));
             pointService.update(new UpdateWrapper<SchBasePoint>()

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.tasks.wash;
+package org.nl.wms.scheduler_manage.service.extendtask.wash;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -8,15 +8,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.enums.WorkerOrderEnum;
-import org.nl.common.publish.BussEventMulticaster;
-import org.nl.common.publish.event.PointEvent;
 import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.MapOf;
 import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
@@ -24,27 +20,22 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
-import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
-import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
 import org.nl.wms.storage_manage.IOSEnum;
 import org.nl.wms.storage_manage.pda.PDAEnum;
 import org.nl.wms.storage_manage.pda.service.PdaStBcpInService;
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -114,14 +105,14 @@ public class WashCallEmptyTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public String createTask(JSONObject param) {
         PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
-                .eq("workorder_code", param.getString("workorder_code"))
+                .eq("workorder_code","123456")// param.getString("workorder_code"))
                 .eq("is_delete", false)
                 .lt("workorder_status",  WorkerOrderEnum.COMPLETE.getCode()));
         Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code")));
         //?刻字满料请求：可以存在多个任务？
         List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
                 .lt("task_status", StatusEnum.TASK_FINISH.getCode())
-                .eq("point_code3", param.getString("device_code")));
+                .eq("point_code1", param.getString("device_code")));
         if (!CollectionUtils.isEmpty(list)){
             throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
         }
@@ -137,6 +128,11 @@ public class WashCallEmptyTask extends AbstractAcsTask {
                 data.add(task);
                 // 下发
                 wms.issueTaskToAcs2(data);
+                structattrService.update(
+                        new UpdateWrapper<StIvtStructattr>().lambda()
+                                .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("入库锁"))
+                                .eq(StIvtStructattr::getStruct_code, task.getString("point_code3"))
+                );
             }, "bcpcallemp", 2);
         } catch (Exception ex) {
             log.error("刻字请求异常,error:{}",ex);
@@ -144,15 +140,14 @@ public class WashCallEmptyTask extends AbstractAcsTask {
             schBaseTask.setUpdate_time(new Date());
             schBaseTask.setUpdate_name("acs");
             schBaseTask.setTask_status(StatusEnum.TASK_START_ERROR.getCode());
-            taskService.save(schBaseTask);
+            taskService.updateById(schBaseTask);
         }
-        pdaStBcpInService.callVehicle();
         return task.getString("task_id");
 
     }
 
     @NotNull
-    private JSONObject packageTask(String end_point_code, String material_id,String fk) {
+    private JSONObject packageTask(String start_point_code, String material_id,String fk) {
         JSONObject task = new JSONObject();
         task.put("task_id", IdUtil.getStringId());
         task.put("task_name", AcsTaskEnum.TASK_WASH_EMP.getDesc());
@@ -161,7 +156,7 @@ public class WashCallEmptyTask extends AbstractAcsTask {
         task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode());
         task.put("material_id", material_id);
         task.put("task_status", StatusEnum.TASK_CREATE.getCode());
-        task.put("point_code3", end_point_code);
+        task.put("point_code1", start_point_code);
         task.put("handle_class", this.getClass().getName());
         task.put("is_delete", StatusEnum.STATUS_FLASE.getCode());
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -216,12 +211,10 @@ public class WashCallEmptyTask extends AbstractAcsTask {
         );
 
         if (ObjectUtil.isEmpty(attrDao)) throw new BadRequestException("未找到空载具！");
-        // 5.锁住仓位
-        attrDao.setLock_type(IOSEnum.LOCK_TYPE.code("其他锁"));
-        structattrService.updateById(attrDao);
+
         // 设置点位
         task.put("update_time", DateUtil.now());
-        task.put("point_code1",attrDao.getStruct_code());
+        task.put("point_code3",attrDao.getStruct_code());
         SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class);
         schBaseTask.setTask_status(StatusEnum.TASK_START_END_P.getCode());
         schBaseTask.setTask_group_id(org.nl.common.utils.IdUtil.getStringId());

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java

@@ -1,7 +1,6 @@
-package org.nl.wms.product_manage.sch.tasks.wash;
+package org.nl.wms.scheduler_manage.service.extendtask.wash;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -19,16 +18,14 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
-import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
-import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionDefinition;
@@ -46,10 +43,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class WashSendMaterialQZTask extends AbstractAcsTask {
 
-    @Autowired
-    private DivRuleCpService divRuleCpService;
-    @Autowired
-    private IStIvtSectattrService sectattrService;
     @Autowired
     private IPdmProduceWorkorderService workorderService;
     @Autowired
@@ -71,13 +64,12 @@ public class WashSendMaterialQZTask extends AbstractAcsTask {
                     .set("task_status", StatusEnum.TASK_RUNNING.getCode())
                     .set("update_name", "acs")
                     .set("update_time", DateUtil.now()).eq("task_id", one.getTask_id());
-            if (!("fall_finish"+one.getTask_id()).equals(one.getRemark())){
+
+            Map<String, String> extParam = (Map)param.get("ext_param");
+            String weight = extParam.get("weight");
+            if (StringUtils.isNotEmpty(weight) && Integer.valueOf(weight)>0){
                 updateWrapper.set("remark","fall_finish"+one.getTask_id());
-                Map<String, String> extParam = (Map)param.get("ext_param");
-                String weight = extParam.get("weight");
-                if (StringUtils.isNotEmpty(weight) && Integer.valueOf(weight)>0){
-                    updateWrapper.set("material_qty",weight);
-                }
+                updateWrapper.set("material_qty",weight);
             }
             taskService.update(updateWrapper);
         }
@@ -120,7 +112,7 @@ public class WashSendMaterialQZTask extends AbstractAcsTask {
         PdmProduceWorkorder order = null;
         if (StringUtils.isNotEmpty(param.getString("workorder_code"))){
             order = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
-                    .eq("workorder_code", param.getString("workorder_code"))
+                    .eq("workorder_code", "123456")// param.getString("workorder_code"))
                     .eq("is_delete", false)
                     .lt("workorder_status",  WorkerOrderEnum.COMPLETE.getCode()));
         }
@@ -137,8 +129,8 @@ public class WashSendMaterialQZTask extends AbstractAcsTask {
         String taskdtl_id = IdUtil.getStringId();
         JSONObject task = new JSONObject();
         task.put("task_id", taskdtl_id);
-        task.put("task_name", AcsTaskEnum.REQUEST_WASH_FULL_ERROR.getDesc());
-        task.put("task_type", AcsTaskEnum.REQUEST_WASH_FULL_ERROR.getCode());
+        task.put("task_name", AcsTaskEnum.TASK_WASH_FULL_QZ.getDesc());
+        task.put("task_type", AcsTaskEnum.TASK_WASH_FULL_QZ.getCode());
         task.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
         task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode());
         task.put("material_id", order!=null?order.getMaterial_id():"");

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java

@@ -0,0 +1,132 @@
+package org.nl.wms.scheduler_manage.service.extendtask.wash;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.enums.StatusEnum;
+import org.nl.common.enums.WorkerOrderEnum;
+import org.nl.common.utils.IdUtil;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
+import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
+import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
+import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
+import org.nl.wms.storage_manage.pda.service.PdaStBcpInService;
+import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/*
+ * @author ZZQ
+ * @Date 2023/6/16 08:40
+ * 清洗机下料满料请求
+ */
+@Service
+@Slf4j
+public class WashSendMaterialTask extends AbstractAcsTask {
+
+    @Autowired
+    private IStIvtStructattrService structattrService;
+    @Autowired
+    private DivRuleCpService divRuleCpService;
+    @Autowired
+    private IStIvtSectattrService sectattrService;
+    @Autowired
+    private IPdmProduceWorkorderService workorderService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private PdaStBcpInService pdaStBcpInService;
+    @Autowired
+    private WashSendMaterialQZTask sendMaterialQZTask;
+    @Autowired
+    private IStIvtIostorinvBcpService stIvtIostorinvBcpService; // 仓位服务
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateTaskStatus(JSONObject param, String status) {
+        stIvtIostorinvBcpService.taskOperate(param);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String createTask(JSONObject param) {
+        if (StringUtils.isEmpty(param.getString("weight"))||StringUtils.isEmpty(param.getString("vehicle_code"))){
+            return sendMaterialQZTask.createTask(param);
+        }else {
+            String start_point_code = param.getString("device_code");
+            PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper<PdmProduceWorkorder>()
+                    .eq("workorder_code", "123456")// param.getString("workorder_code"))
+                    .eq("is_delete", false)
+                    .lt("workorder_status",  WorkerOrderEnum.COMPLETE.getCode()));
+            Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code")));
+            //?刻字满料请求：可以存在多个任务？
+            List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
+                    .lt("task_status", StatusEnum.TASK_FINISH.getCode())
+                    .and(wa->wa
+                            .eq("point_code1", start_point_code)
+                            .or()
+                            .eq("point_code3", start_point_code))
+            );
+            if (!CollectionUtils.isEmpty(list)){
+                throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
+            }
+            JSONObject form = new JSONObject();
+            form.put("bill_type","0001");
+            form.put("point_code",start_point_code);
+            form.put("stor_id","15286279952695336962");//半成品仓库
+            form.put("plan_qty",order.getPlan_qty());
+            form.put("material_id",order.getMaterial_id());
+            form.put("unit_weight",order.getMaterial_weight());
+            form.put("storagevehicle_code",param.getString("vehicle_code"));
+            form.put("product_code","A1");
+            form.put("auto_send",true);
+            pdaStBcpInService.createIn(form);
+            return "";
+        }
+    }
+
+    @Override
+    public void cancel(String task_id) {
+        taskService.update(new UpdateWrapper<SchBaseTask>()
+                .set("task_status",StatusEnum.TASK_CANNEL.getCode())
+                .set("update_name","acs")
+                .set("update_time",DateUtil.now()).eq("task_id",task_id));
+    }
+
+    /**
+     * 满料请求
+     * 清洗机入半成品库
+     */
+    @Override
+    public void pointConfirm(JSONObject task) {
+
+    }
+
+    @Override
+    public List<SchBaseTask> schedulerTask(List<SchBaseTask> tasks) {
+        ArrayList<SchBaseTask> Merge = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(tasks)){
+            for (SchBaseTask task : tasks) {
+                task.setTask_group_id(IdUtil.getStringId());
+                Merge.add(task);
+            }
+        }
+        return Merge;
+    }
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/ISchBasePointService.java

@@ -3,9 +3,7 @@ package org.nl.wms.scheduler_manage.service.point;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.product_manage.sch.service.dto.PointDto;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java

@@ -1,8 +1,6 @@
 package org.nl.wms.scheduler_manage.service.point.impl;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.google.common.collect.Lists;
 import io.jsonwebtoken.lang.Assert;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
@@ -18,12 +15,9 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.point.dao.mapper.SchBasePointMapper;
@@ -31,9 +25,6 @@ import org.nl.wms.scheduler_manage.service.region.ISchBaseRegionService;
 import org.nl.wms.scheduler_manage.service.region.dao.SchBaseRegion;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
-import org.nl.wms.storage_manage.CHECKEnum;
-import org.nl.wms.storage_manage.productmanage.service.check.dao.StIvtCheckdtlCp;
-import org.nl.wms.storage_manage.productmanage.service.check.dao.StIvtCheckmstCp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/scheduler/EngraveScheduleService.java

@@ -10,7 +10,7 @@ import org.nl.common.utils.BaseCode;
 import org.nl.common.utils.IdUtil;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
-import org.nl.wms.product_manage.sch.tasks.wash.WashSendMaterialTask;
+import org.nl.wms.scheduler_manage.service.extendtask.wash.WashSendMaterialTask;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpOutService;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/PointService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.product_manage.sch.service;
+package org.nl.wms.scheduler_manage.service.task;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.product_manage.sch.service.dto.PointDto;
+import org.nl.wms.scheduler_manage.service.task.dto.PointDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/RegionService.java

@@ -1,8 +1,8 @@
-package org.nl.wms.product_manage.sch.service;
+package org.nl.wms.scheduler_manage.service.task;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.product_manage.sch.service.dto.RegionDto;
+import org.nl.wms.scheduler_manage.service.task.dto.RegionDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/TaskService.java

@@ -1,8 +1,8 @@
 
-package org.nl.wms.product_manage.sch.service;
+package org.nl.wms.scheduler_manage.service.task;
 
 import com.alibaba.fastjson.JSONArray;
-import org.nl.wms.product_manage.sch.service.dto.TaskDto;
+import org.nl.wms.scheduler_manage.service.task.dto.TaskDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/PointDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.service.dto;
+package org.nl.wms.scheduler_manage.service.task.dto;
 
 import lombok.Data;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/RegionDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.service.dto;
+package org.nl.wms.scheduler_manage.service.task.dto;
 
 import lombok.Data;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.service.dto;
+package org.nl.wms.scheduler_manage.service.task.dto;
 
 import lombok.Data;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQueryDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.service.dto;
+package org.nl.wms.scheduler_manage.service.task.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/PointServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.service.impl;
+package org.nl.wms.scheduler_manage.service.task.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -19,11 +19,11 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.product_manage.sch.service.PointService;
-import org.nl.wms.product_manage.sch.service.RegionService;
-import org.nl.wms.product_manage.sch.service.dto.PointDto;
+import org.nl.wms.scheduler_manage.service.task.PointService;
+import org.nl.wms.scheduler_manage.service.task.RegionService;
+import org.nl.wms.scheduler_manage.service.task.dto.PointDto;
 
-import org.nl.wms.product_manage.sch.service.dto.RegionDto;
+import org.nl.wms.scheduler_manage.service.task.dto.RegionDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/RegionServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.service.impl;
+package org.nl.wms.scheduler_manage.service.task.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -14,8 +14,8 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.product_manage.sch.service.RegionService;
-import org.nl.wms.product_manage.sch.service.dto.RegionDto;
+import org.nl.wms.scheduler_manage.service.task.RegionService;
+import org.nl.wms.scheduler_manage.service.task.dto.RegionDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -18,8 +18,8 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext_manage.acs.service.AcsToWmsService;
 import org.nl.wms.ext_manage.acs.service.impl.WmsToAcsServiceImpl;
-import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
-import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask;
+import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum;
 import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
 import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/TaskServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.product_manage.sch.service.impl;
+package org.nl.wms.scheduler_manage.service.task.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -16,8 +16,8 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
 import org.nl.wms.ext_manage.acs.service.AcsToWmsService;
-import org.nl.wms.product_manage.sch.service.TaskService;
-import org.nl.wms.product_manage.sch.service.dto.TaskDto;
+import org.nl.wms.scheduler_manage.service.task.TaskService;
+import org.nl.wms.scheduler_manage.service.task.dto.TaskDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;