Merge remote-tracking branch 'origin/master'

mes/hd/nladmin-system/pom.xml

@@ -19,6 +19,12 @@
         <sa-token.version>1.31.0</sa-token.version>
     </properties>
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/com.belerweb/pinyin4j -->
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.0</version>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>

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

@@ -17,7 +17,7 @@
  *
  */
 
-package org.nl.wms.common;
+package org.nl.common;
 import lombok.extern.slf4j.Slf4j;
 
 /**

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

@@ -1,4 +1,4 @@
-package org.nl.wms.common;
+package org.nl.common;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;

mes/hd/nladmin-system/src/main/java/org/nl/common/domain/ConstantParam.java

@@ -1,4 +1,4 @@
-package org.nl.common;
+package org.nl.common.domain;
 
 /*
  * @author ZZQ

mes/hd/nladmin-system/src/main/java/org/nl/common/domain/LockProcess.java

@@ -1,4 +1,4 @@
-package org.nl.common.handler;
+package org.nl.common.domain;
 
 @FunctionalInterface
 public

mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java

@@ -29,12 +29,12 @@ public class BaseQuery<T> {
     /**
      * 是否启用
      */
-    private Boolean isUsed;
+    private Boolean is_used;
     /**
      * 创建时间范围查询
      */
-    private Date startTime;
-    private Date endTime;
+    private Date start_time;
+    private Date end_time;
 
 
     /**
@@ -44,8 +44,8 @@ public class BaseQuery<T> {
      * 通过buid构建
      */
     public Map<String, QParam> doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()
-            ,"startTime", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build()
-            ,"endTime", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build()
+            ,"start_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build()
+            ,"end_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build()
             ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()
     );
 
@@ -64,6 +64,8 @@ public class BaseQuery<T> {
                     ColumnCache columnCache = columnMap.get(LambdaUtils.formatKey(key));
                     if (columnCache!=null){
                         wrapper.eq(columnCache.getColumn(),vel);
+                    }else {
+                        wrapper.eq(key,vel);
                     }
                 }
             }

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

@@ -1,4 +1,4 @@
-package org.nl.wms.st.in;
+package org.nl.common.enums;
 
 /**
  * 区域字典表（sch_area_type）:

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

@@ -1,4 +1,4 @@
-package org.nl.wms.st.in;
+package org.nl.common.enums;
 
 /**
  * 业务常量配置类
@@ -11,5 +11,5 @@ public class BussConstant {
     // 压制出库数量单位
     public static final String YZ_OUT_QTY_UNIT_ID = "1";
 
-    
+
 }

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

@@ -69,9 +69,6 @@ public enum StatusEnum {
     IOS_CREATE("01","生成",""),
     IOS_RUNNING("02","执行中",""),
     IOS_FINISH("99","完成",""),
-    //载具超限
-    OVERSTRUCT_STANDARD("1","标准",""),
-    OVERSTRUCT_LIMIT("2","超限",""),
     ;
 
     private String code;

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

@@ -1,4 +1,4 @@
-package org.nl.wms.st.in;
+package org.nl.common.enums;
 
 import cn.hutool.core.util.StrUtil;
 

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

@@ -0,0 +1,9 @@
+package org.nl.common.publish;
+
+/*
+ * @author ZZQ
+ * @Date 2023/4/28 13:40
+ */
+public abstract class AbstraceListener<E extends PublishEvent> {
+    protected abstract void doEvent(E event);
+}

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

@@ -0,0 +1,80 @@
+package org.nl.common.publish;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/*
+ * @author ZZQ
+ * @Date 2023/4/28 13:42
+ */
+@Component
+public class BussEventMulticaster implements BeanPostProcessor {
+
+    private static Set<AbstraceListener<?>> LISTENER_SRT = new LinkedHashSet<>();
+
+    public final static void publish(PublishEvent event, Boolean sync){
+        if (event == null){
+            return;
+        }
+        for (AbstraceListener listener : getListenerByEvent(event)) {
+            if (sync){
+                listener.doEvent(event);
+            }else {
+                new Thread(()->{
+                    listener.doEvent(event);
+                }).start();
+            }
+        }
+    }
+    public final static void Publish(PublishEvent event){ publish(event,true); }
+    private static List<AbstraceListener<?>> getListenerByEvent(PublishEvent event){
+        List<AbstraceListener<?>> list = new ArrayList<>();
+        try {
+            if (!CollectionUtils.isEmpty(LISTENER_SRT)){
+                Class<? extends PublishEvent> aClass = event.getClass();
+                String typeName = aClass.getTypeName();
+                if (typeName ==null){
+                    return list;
+                }
+                for (AbstraceListener<?> listener : LISTENER_SRT) {
+                    Type superclass = listener.getClass().getGenericSuperclass();
+                    ParameterizedType p=(ParameterizedType)superclass;
+                    Type[] allTType = p.getActualTypeArguments();
+                    if (allTType ==null || allTType.length==0){
+                        continue;
+                    }
+                    for (Type type : allTType) {
+                        String name = type.getTypeName();
+                        if (typeName.equals(name)){
+                            list.add(listener);
+                        }
+                    }
+                }
+            }
+            return list;
+        }catch (Exception e){
+            e.printStackTrace();
+            return list;
+        }
+    }
+    @Override
+    public Object postProcessAfterInitialization(@NotNull Object bean, String beanName) throws BeansException {
+        if (bean instanceof AbstraceListener){
+            AbstraceListener listener = (AbstraceListener) bean;
+            LISTENER_SRT.add(listener);
+            System.out.println("_________"+beanName);
+        }
+        return bean;
+    }
+
+}

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

@@ -0,0 +1,8 @@
+package org.nl.common.publish;
+
+/*
+ * @author ZZQ
+ * @Date 2023/4/28 13:39
+ */
+public interface PublishEvent {
+}

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

@@ -0,0 +1,10 @@
+package org.nl.common.publish.event;
+
+import org.nl.common.publish.PublishEvent;
+
+/*
+ * @author ZZQ
+ * @Date 2023/4/28 13:50
+ */
+public class PointEvent implements PublishEvent {
+}

mes/hd/nladmin-system/src/main/java/org/nl/common/publish/listener/PointListener.java

@@ -0,0 +1,17 @@
+package org.nl.common.publish.listener;
+
+import org.nl.common.publish.AbstraceListener;
+import org.nl.common.publish.event.PointEvent;
+import org.springframework.stereotype.Component;
+
+/*
+ * @author ZZQ
+ * @Date 2023/4/28 13:57
+ */
+@Component
+public class PointListener extends AbstraceListener<PointEvent> {
+    @Override
+    protected void doEvent(PointEvent event) {
+        System.out.println("----事件触发-----");
+    }
+}

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

@@ -7,11 +7,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.StatusEnum;
-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.system.service.param.impl.SysParamServiceImpl;
-import org.nl.wms.sch.manage.TaskStatusEnum;
+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 java.util.ArrayList;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.utils;
+package org.nl.common.utils;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;

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

@@ -1,13 +1,12 @@
 package org.nl.common.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.nl.config.thread.ThreadPoolExecutorUtil;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.system.service.ql.IPdmQlOptionService;
-import org.nl.system.service.ql.dao.PdmQlOption;
+import org.nl.wms.system_manage.service.ql.IPdmQlOptionService;
+import org.nl.wms.system_manage.service.ql.dao.PdmQlOption;
 
 import java.util.Date;
 import java.util.Map;
@@ -34,7 +33,7 @@ public class OptionRecord {
             qlOption.setCreateId(SecurityUtils.getCurrentUserId());
             qlOption.setCreateId(SecurityUtils.getCurrentNickName());
             qlOption.setBussclass(classname.name());
-            bean.save(qlOption);
+//            bean.save(qlOption);
         });
     }
 

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.utils;
+package org.nl.common.utils;
 
 import org.springframework.data.domain.Page;
 

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

@@ -1,9 +1,8 @@
-package org.nl.utils;
+package org.nl.common.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.enums.StatusEnum;
-import org.nl.common.utils.MapOf;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,14 +1,13 @@
 package org.nl.common.utils;
 
 import lombok.SneakyThrows;
-import org.nl.common.handler.LockProcess;
+import org.nl.common.domain.LockProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 
 import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
 
 /*
  * @author ZZQ
@@ -22,7 +21,7 @@ public class RedissonUtils {
      * @param seconds 尝试获取锁的等待时间,允许为空
      */
     @SneakyThrows
-    public static  void lock(LockProcess process, String key, Integer seconds){
+    public static void lock(LockProcess process, String key, Integer seconds){
         RedissonClient redissonClient = SpringContextHolder.getBean(RedissonClient.class);
         RLock lock = redissonClient.getLock(key);
         boolean isLock;

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

@@ -5,7 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.system.service.user.dto.CurrentUser;
+import org.nl.wms.system_manage.service.user.dto.CurrentUser;
 
 import java.util.List;
 

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.nl.utils;
+package org.nl.common.utils;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;

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

@@ -1,4 +1,4 @@
-package org.nl.wms;
+package org.nl.common.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -21,7 +21,7 @@ import java.util.Map;
 @Slf4j
 public class WebServiceUtil {
 	/**
-	 * 
+	 *
 	 * @param url 第三方系统提供webservice的接口url
 	 * @param method 第三方系统提供webservice对应的方法名
 	 * @param form 第三方系统提供webservice对应的方法请求参数
@@ -31,36 +31,36 @@ public class WebServiceUtil {
 	 public static String process(String url, String method, HashMap<String,String> form) throws Exception{
 		 //构建返回值
 		JSONObject result = new JSONObject();
-		 //第一步：创建服务地址  
-        URL netUrl = new URL(url);  
+		 //第一步：创建服务地址
+        URL netUrl = new URL(url);
 
-        //第二步：打开一个通向服务地址的连接 
-        HttpURLConnection connection = (HttpURLConnection) netUrl.openConnection();  
+        //第二步：打开一个通向服务地址的连接
+        HttpURLConnection connection = (HttpURLConnection) netUrl.openConnection();
 
-        //第三步：设置参数  
-        connection.setRequestMethod("POST");  
+        //第三步：设置参数
+        connection.setRequestMethod("POST");
          //设置超时时间
         connection.setConnectTimeout(50000);
 
 
-        //3.2设置数据格式：content-type  
-        connection.setRequestProperty("content-type", "text/xml;charset=utf-8");  
+        //3.2设置数据格式：content-type
+        connection.setRequestProperty("content-type", "text/xml;charset=utf-8");
 
-        //3.3设置输入输出，因为默认新创建的connection没有读写权限，  
-        connection.setDoInput(true);  
+        //3.3设置输入输出，因为默认新创建的connection没有读写权限，
+        connection.setDoInput(true);
 
-        connection.setDoOutput(true);  
-  
+        connection.setDoOutput(true);
 
-        //第四步：组织SOAP数据，发送请求  
-        String soapXML = getXML(form,method);  
+
+        //第四步：组织SOAP数据，发送请求
+        String soapXML = getXML(form,method);
 
         //将信息以流的方式发送出去
-        OutputStream os = connection.getOutputStream();  
+        OutputStream os = connection.getOutputStream();
 
-        os.write(soapXML.getBytes());  
+        os.write(soapXML.getBytes());
 
-        //第五步：接收服务端响应，打印  
+        //第五步：接收服务端响应，打印
 
         int responseCode = connection.getResponseCode();
 		 String ret="默认值";
@@ -68,19 +68,19 @@ public class WebServiceUtil {
         if(200 == responseCode){//表示服务端响应成功
         	log.info("请求成功！");
             //获取当前连接请求返回的数据流
-            InputStream is = connection.getInputStream();  
+            InputStream is = connection.getInputStream();
 
             InputStreamReader isr = new InputStreamReader(is,"utf-8");
 
-            BufferedReader br = new BufferedReader(isr);  
+            BufferedReader br = new BufferedReader(isr);
 
-            StringBuilder sb = new StringBuilder();  
+            StringBuilder sb = new StringBuilder();
 
-            String temp = null;  
+            String temp = null;
 
-            while(null != (temp = br.readLine())){  
-                sb.append(temp);  
-            }  
+            while(null != (temp = br.readLine())){
+                sb.append(temp);
+            }
 
             //打印结果
 
@@ -89,13 +89,13 @@ public class WebServiceUtil {
             	ret = ret.replaceAll("\\<\\?.+\\?\\>", "<?xml version='1.0' encoding='UTF-8'?>");
             else
             	ret = (new StringBuilder("<?xml version='1.0' encoding='UTF-8'?>")).append(ret).toString();
-            
+
           /*  String now = xml2jsonString(ret);
-            System.out.println("打印返回结果转成jsonString-------------");  
+            System.out.println("打印返回结果转成jsonString-------------");
             result =JSONObject.parseObject(now);*/
-            is.close();  
-            isr.close();  
-            br.close();  
+            is.close();
+            isr.close();
+            br.close();
             //关闭连接
             connection.disconnect();
         }
@@ -112,13 +112,13 @@ public class WebServiceUtil {
 	 */
 	private static String getXML(Map<String,String> form, String method){
 		StringBuffer sb = new StringBuffer();
-    	sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?> "); 
-    	sb.append("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:urn=\"urn:sap-com:document:sap:soap:functions:mc-style\">"); 
-    	sb.append("<soapenv:Header/>"); 
-    	sb.append("<soapenv:Body>"); 
-    	sb.append("<urn:"+method+">"); 
+    	sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?> ");
+    	sb.append("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:urn=\"urn:sap-com:document:sap:soap:functions:mc-style\">");
+    	sb.append("<soapenv:Header/>");
+    	sb.append("<soapenv:Body>");
+    	sb.append("<urn:"+method+">");
     	if(method.contains("ZSd0002SendMatMd"))
-    		sb.append("<In>"); 
+    		sb.append("<In>");
     	// 设置请求参数
 		for(Iterator<String> it = form.keySet().iterator();it.hasNext();){
 			String key = it.next();
@@ -126,29 +126,29 @@ public class WebServiceUtil {
 			sb.append("        <"+key+">"+value+"</"+key+">");
 		}
 		if(method.contains("ZSd0002SendMatMd"))
-			sb.append("</In>"); 
-    	sb.append("</urn:"+method+">"); 
-    	sb.append("</soapenv:Body>"); 
-    	sb.append("</soapenv:Envelope>");   
+			sb.append("</In>");
+    	sb.append("</urn:"+method+">");
+    	sb.append("</soapenv:Body>");
+    	sb.append("</soapenv:Envelope>");
     	log.info("getXML组织参数为-----------------"+sb.toString());
-        return sb.toString();  
+        return sb.toString();
 
-    }  
+    }
 /*
 	public static String xml2jsonString(String xml) throws Exception {
          JSONObject xmlJSONObj = XML.toJSONObject(xml);
         return xmlJSONObj.toString();
     }*/
 
-	  public static void main(String[] args) throws Exception {  
-		  	
+	  public static void main(String[] args) throws Exception {
+
 		/*String url = "http://192.168.0.82:8000/sap/bc/srt/rfc/sap/z_sd0002_send_mat_md/800/z_sd0002_send_mat_md/binding";
 			String method = "ZSd0002SendMatMd";
 			HashMap<String,String> form = new HashMap<String,String>();
-			form.put("MatnrFr", "24018347S"); 
+			form.put("MatnrFr", "24018347S");
 			form.put("MatnrTo", "24018347S");
 			//非必填字段
-		  JSONObject ret  =  WebServiceUtil.process(url,method,form);  
+		  JSONObject ret  =  WebServiceUtil.process(url,method,form);
 		  System.out.println("getXML返回数据-----------------"+ret.toString());
 		  JSONObject Envelope = ret.optJSONObject("soap-env:Envelope");
 		  JSONObject Body = Envelope.optJSONObject("soap-env:Body");
@@ -164,7 +164,7 @@ public class WebServiceUtil {
 			form.put("IErdatTo", "2019-05-08");
 			//非必填字段
 			form.put("IVbeln", "");
-		  JSONObject ret  =  WebServiceUtil.process(url,method,form);  
+		  JSONObject ret  =  WebServiceUtil.process(url,method,form);
 		  System.out.println("getXML发送数据-----------------"+ret.toString());
 		  JSONObject Envelope = ret.optJSONObject("soap-env:Envelope");
 		  JSONObject Body = Envelope.optJSONObject("soap-env:Body");
@@ -181,7 +181,7 @@ public class WebServiceUtil {
 			//非必填字段
 			form.put("IVbeln", "");
 			//非必填字段
-			 JSONObject ret  =  WebServiceUtil.process(url,method,form);  
+			 JSONObject ret  =  WebServiceUtil.process(url,method,form);
 			  System.out.println("getXML发送数据-----------------"+ret.toString());
 			  JSONObject Envelope = ret.optJSONObject("soap-env:Envelope");
 			  JSONObject Body = Envelope.optJSONObject("soap-env:Body");
@@ -190,5 +190,5 @@ public class WebServiceUtil {
 			  JSONArray item = TZtdn.optJSONArray("item");
 			  System.out.println("例子：查询结果字段OResultmsg-----------------"+ZfmGetDnZjwlResponse.optString("OResultmsg"));
 			  System.out.println("例子：查询结果数组size-----------------"+item.size());*/
-	    }  
+	    }
 }

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

@@ -10,7 +10,7 @@ public interface IErrorCode{
      /**
       * 返回状态码
       */
-     long getCode();
+     Integer getCode();
 
      /**
       * 返回提示

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

@@ -57,16 +57,16 @@ public enum ResultCode implements IErrorCode{
      ERR_SEND_LIMIT(2101, "短信发送上限"),
      ERR_PHONE(2102, "短信号码不正确"),
      ERR_Content(2103, "短信内容不能为空");
-     private final long code;
+     private final Integer code;
      private final String desc;
 
-     ResultCode(long code, String desc) {
+     ResultCode(Integer code, String desc) {
           this.code = code;
           this.desc = desc;
      }
 
      @Override
-     public long getCode() {
+     public Integer getCode() {
           return code;
      }
 

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

@@ -1,31 +1,16 @@
 package org.nl.config;
 
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.druid.pool.DruidDataSource;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.AcsTaskEnum;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.common.DataTypeEnum;
 import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl;
-import org.nl.wms.sch.tasks.SpeMachineryTask;
-import org.nl.wms.sch.tasks.WashMachineryTask;
-import org.nl.wms.sch.tasks.callMaterial.WrapCallMaterialTask;
-import org.nl.wms.sch.tasks.sendEmpty.WrapSendEmptyTask;
-import org.nl.wms.sch.tasks.sendMaterial.PlotterSendMaterialTask;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.system.ApplicationPid;
+import org.nl.wms.product_manage.sch.tasks.SpeMachineryTask;
+import org.nl.wms.product_manage.sch.tasks.WashMachineryTask;
+import org.nl.wms.product_manage.sch.tasks.callMaterial.WrapCallMaterialTask;
+import org.nl.wms.product_manage.sch.tasks.sendEmpty.WrapSendEmptyTask;
+import org.nl.wms.product_manage.sch.tasks.sendMaterial.PlotterSendMaterialTask;
 import org.springframework.context.SmartLifecycle;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-import java.sql.DriverManager;
-import java.sql.SQLException;
 
 @Configuration
 @Slf4j

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

@@ -81,7 +81,7 @@ public class CodeGenerator {
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.no_change);
 //        strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!");
         strategy.setEntityLombokModel(true);
         strategy.setRestControllerStyle(true);

mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation;
 import org.nl.common.anno.Log;
 
 import org.nl.modules.logging.service.InterfaceLogService;
-import org.nl.wms.sch.service.PointService;
 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/modules/security/rest/MobileAuthorizationController.java

@@ -10,17 +10,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.modules.common.config.RsaProperties;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.RedisUtils;
 import org.nl.modules.common.utils.RsaUtils;
-import org.nl.system.service.role.ISysRoleService;
-import org.nl.system.service.secutiry.dto.AuthUserDto;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.system.service.user.dto.CurrentUser;
+import org.nl.wms.system_manage.service.role.ISysRoleService;
+import org.nl.wms.system_manage.service.secutiry.dto.AuthUserDto;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dto.CurrentUser;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -66,13 +65,13 @@ public class MobileAuthorizationController{
           List<String> permissionList = roleService.getPermissionList(JSONObject.parseObject(JSON.toJSONString(userDto)));
           // 登录输入，登出删除
           CurrentUser user = new CurrentUser();
-          user.setId(userDto.getUserId());
+          user.setId(userDto.getUser_id());
           user.setUsername(userDto.getUsername());
-          user.setPresonName(userDto.getPersonName());
+          user.setPresonName(userDto.getPerson_name());
           user.setUser(userDto);
           user.setPermissions(permissionList);
           // SaLoginModel 配置登录相关参数
-          StpUtil.login(userDto.getUserId(), new SaLoginModel().setDevice("PE")                // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型
+          StpUtil.login(userDto.getUser_id(), new SaLoginModel().setDevice("PE")                // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型
                                                                .setExtra("loginInfo", user)    // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效）
                        );
           // 返回 token 与 用户信息

mes/hd/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java

@@ -2,12 +2,10 @@ package org.nl.modules.security.satoken.utils;
 
 import cn.dev33.satoken.stp.StpUtil;
  import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
 import net.dreamlu.mica.core.utils.BeanUtil;
-import org.apache.commons.beanutils.BeanUtils;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.system.service.user.dto.CurrentUser;
-import org.nl.system.service.user.dto.UserDto;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dto.CurrentUser;
+import org.nl.wms.system_manage.service.user.dto.UserDto;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java

@@ -1,21 +0,0 @@
-package org.nl.system.service.user.dto;
-
-import lombok.Data;
-import java.util.Date;
-
-import org.nl.system.service.dept.dao.SysDept;
-import org.nl.system.service.role.dao.SysRole;
-import org.nl.system.service.user.dao.SysUser;
-
-import java.util.List;
-
-/*
- * @author ZZQ
- * @Date 2022/12/16 10:02 上午
- */
-@Data
-public class SysUserDetail extends SysUser {
-    private List<SysDept> depts;
-
-    private List<SysRole> roles;
-}

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

@@ -6,7 +6,6 @@ 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.apache.commons.lang3.StringUtils;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
@@ -14,16 +13,13 @@ import org.nl.common.utils.MapOf;
 import org.nl.common.utils.api.ResultCode;
 import org.nl.modules.common.exception.BizCoreException;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
-import org.nl.wms.pda.service.CacheLineHandService;
-import org.nl.wms.sch.tasks.SpeMachineryTask;
-import org.nl.wms.sch.tasks.TaskScheduleService;
-import org.nl.wms.sch.tasks.WashMachineryTask;
+import org.nl.wms.product_manage.sch.tasks.TaskScheduleService;
+import org.nl.wms.product_manage.sch.tasks.WashMachineryTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,8 +32,12 @@ import java.util.Map;
 @Slf4j
 @SaIgnore
 public class AcsToWmsController {
-    private final AcsToWmsService acsToWmsService;
-    private final WashMachineryTask washMachineryTask;
+    @Autowired
+    private AcsToWmsService acsToWmsService;
+    @Autowired
+    private  TaskScheduleService taskScheduleService;
+    @Autowired
+    private  WashMachineryTask washMachineryTask;
 
     @PostMapping("/apply")
     @Log("ACS给WMS发送任务")
@@ -133,7 +133,7 @@ public class AcsToWmsController {
         washMachineryTask.createTask(new JSONObject(MapOf.of("device_code","QX03")));
         return null;
     }
-    @PostMapping("/taskPublish")
+    @GetMapping("/taskPublish")
     @Log("向wms反实施数量")
     @ApiOperation("向wms反订单实施数量")
     @SaIgnore

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

@@ -3,15 +3,12 @@ package org.nl.wms.ext.acs.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
- import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 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.MapOf;
 import org.nl.common.utils.OptionRecord;
@@ -21,17 +18,10 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.nl.wms.pda.service.CacheLineHandService;
-import org.nl.wms.sch.manage.AbstractAcsTask;
-import org.nl.wms.sch.service.TaskService;
-import org.nl.wms.sch.service.dto.TaskDto;
-import org.nl.wms.sch.tasks.SpeMachineryTask;
-import org.nl.wms.sch.tasks.callEmpty.PlotterCallEmptyTask;
-import org.nl.wms.sch.tasks.callMaterial.WrapCallMaterialTask;
-import org.nl.wms.sch.tasks.sendEmpty.WrapSendEmptyTask;
-import org.nl.wms.sch.tasks.sendMaterial.PlotterSendMaterialTask;
-import org.nl.wms.sch.tasks.WashMachineryTask;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
+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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
@@ -40,16 +30,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.PostConstruct;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 
 @Service
 @Slf4j
@@ -66,9 +52,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
 
 
     @Override
-    @Transactional
     public Map<String, Object> apply(JSONObject param) {
-        Assert.notNull(param,"请求参数不存在");
+        Assert.notNull(param,"请求参数不能为空");
         Map result = MapOf.of("status", HttpStatus.OK.value(), "message", "ACS向WMS申请任务成功!");
         AcsTaskEnum taskEnum = AcsTaskEnum.getType(param.getString("type"), "REQUEST_");
 

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

@@ -5,16 +5,18 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.nl.common.ConstantParam;
+import org.nl.common.domain.ConstantParam;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.MapOf;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.utils.PointLockUtils;
-import org.redisson.api.RedissonClient;
+import org.nl.common.utils.PointLockUtils;
+import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
+import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -31,11 +33,7 @@ import java.util.stream.Collectors;
 public class AgvInstService {
 
     @Autowired
-    private PointLockUtils pointLockUtils;
-    @Autowired
-    private PlatformTransactionManager transactionManager;
-    @Autowired
-    private RedissonClient redissonClient;
+    private ISchBasePointService basePointService;
 
     public static void main(String[] args) {
         String a = "HCX04JG04_SHCX04";
@@ -50,29 +48,31 @@ public class AgvInstService {
     //4.有则创建agv指令，
     // 没有则创建缓存架任务
     public void fullMaster(JSONObject task){
-        WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
-        WQLObject cacheLineSearch = WQLObject.getWQLObject("SCH_cacheLine_region_relation");
-        String point_code = task.getString("start_point_code");
-        String quantity = task.getString("quantity");
-        JSONObject devicePoint = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code + "' and is_delete = 0 and is_used = 1").uniqueResult(0);
+        String point_code = task.getString("point_code1");
+        String quantity = task.getString("material_qty");
+        SchBasePoint devicePoint = basePointService.getOne(new QueryWrapper<SchBasePoint>()
+                .eq("point_code", point_code)
+                .eq("is_delete", "0")
+                .eq("is_used", "1")
+        );
         String nextPoint;
         //判断缓存线是不是去深坑清洗：深坑区域15个点：判断空的物料坑位：
         String cacheVehile = "";
-        if (devicePoint.getString("next_region_code").equals(ConstantParam.SK_REGION)){
+        if (devicePoint.getNext_region_code().equals(ConstantParam.SK_REGION)){
             //查询生坑重量是否超限：深坑需要乘以系数
-            JSONArray nextPointList = WQL.getWO("sch_point").addParamMap(MapOf.of("flag","7","region_code", devicePoint.getString("next_region_code"),"qty",Integer.valueOf(quantity)*ConstantParam.MATERAIL_RATIO)).process().getResultJSONArray(0);
+            JSONArray nextPointList = WQL.getWO("sch_point").addParamMap(MapOf.of("flag","7","region_code", devicePoint.getNext_region_code(),"qty",Integer.valueOf(quantity)*ConstantParam.MATERAIL_RATIO)).process().getResultJSONArray(0);
             if (nextPointList.size() == 0){
-                throw new BadRequestException("深坑清洗储料仓："+devicePoint.getString("next_region_code")+"无可用点位");
+                throw new BadRequestException("深坑清洗储料仓："+devicePoint.getNext_region_code()+"无可用点位");
             }
             nextPoint = nextPointList.getJSONObject(0).getString("point_code");
         }else {
             //专机的话：需要判断专机上料口物料是否满足数量
-            JSONArray nextPointList = WQL.getWO("sch_point").addParamMap(MapOf.of("flag","3","region_code", devicePoint.getString("next_region_code"),"qty",quantity)).process().getResultJSONArray(0);
+            JSONArray nextPointList = WQL.getWO("sch_point").addParamMap(MapOf.of("flag","3","region_code", devicePoint.getNext_region_code(),"qty",quantity)).process().getResultJSONArray(0);
             if (nextPointList.size() == 0){
-                JSONObject cacheLine = cacheLineSearch.query("region_code = '"+devicePoint.getString("region_code")+"'").uniqueResult(0);
+                JSONObject cacheLine = WQLObject.getWQLObject("SCH_cacheLine_region_relation").query("region_code = '"+devicePoint.getRegion_code()+"'").uniqueResult(0);
                 nextPoint = cacheLine.getString("cacheline_code");
                 //满料请求：查询缓存线空载具列表
-                cacheVehile = getEmpCacheVehile(nextPoint, null);
+                cacheVehile = getCacheVehile(nextPoint, null);
                 if (StringUtils.isBlank(cacheVehile)) {
                     throw  new BadRequestException("缓存线："+nextPoint+"没有可用空载具");
                 }
@@ -85,10 +85,10 @@ public class AgvInstService {
         }
         WQLObject.getWQLObject("sch_base_point").update(MapOf.of("task_id",task.getString("task_id"),"lock_type",StatusEnum.LOCK_ON.getCode(),"point_code = '"+nextPoint+"'"));
         task.put("vehicle_code",cacheVehile);
-        task.put("next_point_code",nextPoint);
+        task.put("point_code2",nextPoint);
         task.put("task_status",StatusEnum.TASK_START_END_P.getCode());
         task.put("update_time", DateUtil.now());
-        taskTab.update(task);
+        WQLObject.getWQLObject("sch_base_task").update(task);
     };
     //缺料请求：上料位
     //1.判断当前设备表对应的缓存线是否开放
@@ -96,13 +96,14 @@ public class AgvInstService {
     //3.agv根据对应载具列表行进扫码匹配：匹配到对应物料则创建点对点任务
     public void callMatter(JSONObject task){
         //参数
+        String targetDevice = task.getString("next_point_code");
         String material_id = task.getString("material_id");
         JSONObject devicePoint = WQLObject.getWQLObject("SCH_BASE_Point").query("point_code = '" + targetDevice + "' and is_delete = 0 and is_used = 1").uniqueResult(0);
         JSONObject cacheLine = WQLObject.getWQLObject("SCH_cacheLine_region_relation").query("region_code = '"+devicePoint.getString("region_code")+"' and is_active = '"+StatusEnum.STATUS_TRUE.getCode()+"'").uniqueResult(0);
         Assert.notNull(cacheLine, String.format("区域%s对应缓存线信息不存在", devicePoint.getString("region_code")));
         //缓存线位置编码 :缺料请求获取缓存线满载具列表
         String startPoint = cacheLine.getString("cacheline_code");
-        String cacheVehile = getEmpCacheVehile(startPoint, material_id);
+        String cacheVehile = getCacheVehile(startPoint, material_id);
         if (StringUtils.isBlank(cacheVehile)) {
             throw  new BadRequestException("缓存线："+startPoint+"没有物料"+material_id+"对应可用载具");
         }
@@ -121,9 +122,8 @@ public class AgvInstService {
 
     }
 
-    public String getEmpCacheVehile(String cacheLine, String materialId){
-        WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
-        JSONArray runingTask = taskTable.query("point_code2 = '" + cacheLine + "' and task_status < '" + StatusEnum.TASK_FINISH.getCode() + "'").getResultJSONArray(0);
+    public String getCacheVehile(String cacheLine,String materialId){
+        JSONArray runingTask = WQLObject.getWQLObject("sch_base_task").query("point_code2 = '" + cacheLine + "' and task_status < '" + StatusEnum.TASK_FINISH.getCode() + "'").getResultJSONArray(0);
         String status = StringUtils.isBlank(materialId) ? StatusEnum.CACHE_VEL_EMT.getCode() : StatusEnum.CACHE_VEL_FULL.getCode();
         JSONArray result = WQL.getWO("sch_point").addParamMap(MapOf.of("flag", "6", "vehicle_status", status, "material_id", materialId)).process().getResultJSONArray(0);
         if (result.size()>0){

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

@@ -25,13 +25,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{
         for (Object o : arr) {
             JSONObject task = (JSONObject) o;
             JSONObject param = new JSONObject(MapOf.of("task_id", task.getString("task_id")
-                    , "acs_task_type", task.getString("acs_task_type")
+                    , "task_type", task.getString("acs_task_type")//垃圾
                     , "task_code", task.getString("task_code")
                     , "start_point_code", task.getString("point_code1")//起点
                     , "put_point_code", task.getString("point_code2")//到料
                     , "next_point_code", task.getString("point_code3")//空盘返回点
                     , "task_group_id", StringUtils.isBlank(task.getString("task_group_id"))? IdUtil.getStringId():task.getString("task_group_id")
-                    , "task_type", task.getString("task_type")
                     , "priority", task.getString("priority")
                     , "is_send", task.getString("is_send")
                     , "vehicle_code", task.getString("vehicle_code")

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/login/rest/HandLoginController.java

@@ -10,7 +10,7 @@ import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.modules.common.utils.RedisUtils;
-import org.nl.system.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.ISysUserService;
 import org.nl.wms.ext.login.service.HandLoginService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,9 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/login/service/impl/HandLoginServiceImpl.java

@@ -15,10 +15,10 @@ import com.alibaba.fastjson.JSONObject;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.RedisUtils;
 import org.nl.modules.wql.WQL;
-import org.nl.system.service.role.ISysRoleService;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.system.service.user.dto.CurrentUser;
+import org.nl.wms.system_manage.service.role.ISysRoleService;
+import org.nl.wms.system_manage.service.user.ISysUserService;
+import org.nl.wms.system_manage.service.user.dao.SysUser;
+import org.nl.wms.system_manage.service.user.dto.CurrentUser;
  import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.ext.login.service.HandLoginService;
 
@@ -63,14 +63,14 @@ public class HandLoginServiceImpl implements HandLoginService {
         List<String> permissionList = roleService.getPermissionList(JSONObject.parseObject(JSON.toJSONString(userInfo)));
         // 登录输入，登出删除
         CurrentUser user = new CurrentUser();
-        user.setId(userInfo.getUserId());
+        user.setId(userInfo.getUser_id());
         user.setUsername(userInfo.getUsername());
-        user.setPresonName(userInfo.getPersonName());
+        user.setPresonName(userInfo.getPerson_name());
         user.setUser(userInfo);
         user.setPermissions(permissionList);
 
         // SaLoginModel 配置登录相关参数
-        StpUtil.login(userInfo.getUserId(), new SaLoginModel()
+        StpUtil.login(userInfo.getUser_id(), new SaLoginModel()
                 .setDevice("PE")                // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型
                 .setExtra("loginInfo", user)    // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效）
         );

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

@@ -4,18 +4,15 @@ 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.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.util.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.json.XML;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.exception.WDKException;
-import org.nl.wms.WebServiceUtil;
+import org.nl.common.utils.WebServiceUtil;
 import org.nl.wms.ext.sap.service.WmsToSapService;
 import org.springframework.stereotype.Service;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/material/MdMeMaterialbaseController.java

@@ -0,0 +1,21 @@
+package org.nl.wms.masterdata_manage.controller.material;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 物料基本信息表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-04-26
+ */
+@RestController
+@RequestMapping("/mdMeMaterialbase")
+public class MdMeMaterialbaseController {
+
+}
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/constant/MaterOptTypeEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.constant;
+package org.nl.wms.masterdata_manage.master.constant;
 
 import com.alibaba.fastjson.JSONObject;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/BusinessCodeEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.eum;
+package org.nl.wms.masterdata_manage.master.eum;
 
 public enum BusinessCodeEnum {
     STOCK_IN(1,"10","入库"),

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/RecordStatusEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.eum;
+package org.nl.wms.masterdata_manage.master.eum;
 
 public enum RecordStatusEnum {
     CREATE(1,"01","生成"),

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/manage/AbstructMaterialType.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.manage;
+package org.nl.wms.masterdata_manage.master.manage;
 
 import java.util.HashSet;
 import java.util.Set;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/ClassstandardController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.rest;
+package org.nl.wms.masterdata_manage.master.rest;
 
 
 import cn.hutool.core.map.MapUtil;
@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.anno.Log;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.basedata.master.service.ClassstandardService;
-import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
 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/masterdata_manage/master/rest/CustomerbaseController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.rest;
+package org.nl.wms.masterdata_manage.master.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata.master.service.CustomerbaseService;
-import org.nl.wms.basedata.master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.master.service.CustomerbaseService;
+import org.nl.wms.masterdata_manage.master.service.dto.CustomerbaseDto;
 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/masterdata_manage/master/rest/MaterialbaseController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.rest;
+package org.nl.wms.masterdata_manage.master.rest;
 
 
 import cn.hutool.core.map.MapUtil;
@@ -9,9 +9,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
-import org.nl.wms.basedata.master.service.MaterialbaseService;
-import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.master.constant.MaterOptTypeEnum;
+import org.nl.wms.masterdata_manage.master.service.MaterialbaseService;
+import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
 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/masterdata_manage/master/rest/SemirealrawmaterialController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.rest;
+package org.nl.wms.masterdata_manage.master.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata.master.service.SemirealrawmaterialService;
-import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.master.service.SemirealrawmaterialService;
+import org.nl.wms.masterdata_manage.master.service.dto.SemirealrawmaterialDto;
 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/masterdata_manage/master/rest/StoragevehicleinfoController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.rest;
+package org.nl.wms.masterdata_manage.master.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata.master.service.StoragevehicleinfoService;
-import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.master.service.StoragevehicleinfoService;
+import org.nl.wms.masterdata_manage.master.service.dto.StoragevehicleinfoDto;
 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/masterdata_manage/master/rest/SupplierbaseController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.rest;
+package org.nl.wms.masterdata_manage.master.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata.master.service.SupplierbaseService;
-import org.nl.wms.basedata.master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.master.service.SupplierbaseService;
+import org.nl.wms.masterdata_manage.master.service.dto.SupplierbaseDto;
 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/masterdata_manage/master/rest/UnitController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.rest;
+package org.nl.wms.masterdata_manage.master.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata.master.service.UnitService;
-import org.nl.wms.basedata.master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.master.service.UnitService;
+import org.nl.wms.masterdata_manage.master.service.dto.UnitDto;
 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/masterdata_manage/master/service/ClassstandardService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.basedata.master.service;
+package org.nl.wms.masterdata_manage.master.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/CustomerbaseService.java

@@ -1,7 +1,7 @@
 
-package org.nl.wms.basedata.master.service;
+package org.nl.wms.masterdata_manage.master.service;
 
-import org.nl.wms.basedata.master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.master.service.dto.CustomerbaseDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/MaterialbaseService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.basedata.master.service;
+package org.nl.wms.masterdata_manage.master.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SemirealrawmaterialService.java

@@ -1,8 +1,8 @@
 
-package org.nl.wms.basedata.master.service;
+package org.nl.wms.masterdata_manage.master.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.master.service.dto.SemirealrawmaterialDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/StoragevehicleinfoService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.basedata.master.service;
+package org.nl.wms.masterdata_manage.master.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.master.service.dto.StoragevehicleinfoDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SupplierbaseService.java

@@ -1,7 +1,7 @@
 
-package org.nl.wms.basedata.master.service;
+package org.nl.wms.masterdata_manage.master.service;
 
-import org.nl.wms.basedata.master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.master.service.dto.SupplierbaseDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/UnitService.java

@@ -1,8 +1,8 @@
 
-package org.nl.wms.basedata.master.service;
+package org.nl.wms.masterdata_manage.master.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.basedata.master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.master.service.dto.UnitDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/BusinesstypematerialDto.java

@@ -1,13 +1,11 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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/masterdata_manage/master/service/dto/ClassstandardDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.service.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/masterdata_manage/master/service/dto/CustomerbaseDto.java

@@ -1,13 +1,11 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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/masterdata_manage/master/service/dto/EndrealsemimaterialDto.java

@@ -1,13 +1,11 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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/masterdata_manage/master/service/dto/MaterialParametersDto.java

@@ -1,14 +1,12 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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/masterdata_manage/master/service/dto/MaterialbaseDto.java

@@ -1,14 +1,12 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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;
 
 /**
  * @author zhouz

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/SemirealrawmaterialDto.java

@@ -1,13 +1,11 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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/masterdata_manage/master/service/dto/StoragevehicleinfoDto.java

@@ -1,14 +1,12 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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/masterdata_manage/master/service/dto/SupplierbaseDto.java

@@ -1,14 +1,12 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.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;
 
 /**
  * @author zhouz

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/UnitDto.java

@@ -1,12 +1,10 @@
-package org.nl.wms.basedata.master.service.dto;
+package org.nl.wms.masterdata_manage.master.service.dto;
 
 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/masterdata_manage/master/service/impl/ClassstandardServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.service.impl;
+package org.nl.wms.masterdata_manage.master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -20,8 +20,8 @@ import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.service.ClassstandardService;
-import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
 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/masterdata_manage/master/service/impl/CustomerbaseServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.service.impl;
+package org.nl.wms.masterdata_manage.master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -10,17 +10,16 @@ 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.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.service.ClassstandardService;
-import org.nl.wms.basedata.master.service.CustomerbaseService;
-import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
-import org.nl.wms.basedata.master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.master.service.CustomerbaseService;
+import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.dto.CustomerbaseDto;
 
 
 
@@ -29,7 +28,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/MaterialbaseServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.basedata.master.service.impl;
+package org.nl.wms.masterdata_manage.master.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -10,7 +10,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import org.json.XML;
-import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.config.thread.ThreadPoolExecutorUtil;
 import org.nl.modules.common.exception.BadRequestException;
@@ -19,11 +18,10 @@ import org.nl.modules.common.utils.RedisUtils;
 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.WebServiceUtil;
-import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
-import org.nl.wms.basedata.master.service.ClassstandardService;
-import org.nl.wms.basedata.master.service.MaterialbaseService;
-import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.master.constant.MaterOptTypeEnum;
+import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.master.service.MaterialbaseService;
+import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
 import org.nl.wms.pda.dto.MaterialDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -32,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author zhouz

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SemirealrawmaterialServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.service.impl;
+package org.nl.wms.masterdata_manage.master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -11,20 +11,18 @@ 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.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.basedata.master.service.SemirealrawmaterialService;
-import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.master.service.SemirealrawmaterialService;
+import org.nl.wms.masterdata_manage.master.service.dto.SemirealrawmaterialDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/StoragevehicleinfoServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.service.impl;
+package org.nl.wms.masterdata_manage.master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -11,7 +11,6 @@ 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;
@@ -20,14 +19,13 @@ import org.nl.modules.system.util.CodeUtil;
 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.basedata.master.service.StoragevehicleinfoService;
-import org.nl.wms.basedata.master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.master.service.StoragevehicleinfoService;
+import org.nl.wms.masterdata_manage.master.service.dto.StoragevehicleinfoDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,24 +90,49 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
         if (!ObjectUtil.isEmpty(jsonObject)) {
             throw new BadRequestException("此载具已存在");
         }
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+
+
+        String storagevehicle_type = (String) map.get("storagevehicle_type");
+        String code = "";
+        switch (storagevehicle_type) {
+            case "00":
+                code = "VEHICCLE_CODE_XMTPT";
+                break;
+            case "01":
+                code = "VEHICCLE_CODE_CDMTP";
+                break;
+            case "02":
+                code = "VEHICCLE_CODE_TLD";
+                break;
+            case "03":
+                code = "VEHICCLE_CODE_TTP";
+                break;
+            case "04":
+                code = "VEHICCLE_CODE_XMTPC";
+                break;
+            case "05":
+                code = "VEHICCLE_CODE_LX";
+                break;
+        }
         JSONArray resultCodeArr = new JSONArray();
         int num = MapUtil.getInt(map, "num");
         for (int i = 0; i < num; i++) {
             StoragevehicleinfoDto dto = new StoragevehicleinfoDto();
             dto.setStoragevehicle_id(IdUtil.getSnowflake(1, 1).nextId());
-            dto.setStoragevehicle_code((String) map.get("storagevehicle_code"));
-            dto.setCreate_id(SecurityUtils.getCurrentUserId());
+            dto.setStoragevehicle_code(CodeUtil.getNewCode(code));
+            dto.setCreate_id(currentUserId);
             dto.setStoragevehicle_name(dto.getStoragevehicle_code());
-            dto.setCreate_name(SecurityUtils.getCurrentNickName());
-            dto.setUpdate_id(SecurityUtils.getCurrentUserId());
-            dto.setUpdate_name(SecurityUtils.getCurrentNickName());
+            dto.setCreate_name(nickName);
+            dto.setUpdate_id(currentUserId);
+            dto.setUpdate_name(nickName);
             dto.setUpdate_time(DateUtil.now());
             dto.setCreate_time(DateUtil.now());
-            dto.setOverstruct_type((String) map.get("overstruct_type"));
             dto.setStoragevehicle_type((String) map.get("storagevehicle_type"));
             JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
             wo.insert(json);
-            resultCodeArr.add(dto);
+            resultCodeArr.add(dto.getStoragevehicle_code());
         }
         return resultCodeArr;
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SupplierbaseServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.service.impl;
+package org.nl.wms.masterdata_manage.master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -10,17 +10,16 @@ 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.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.service.ClassstandardService;
-import org.nl.wms.basedata.master.service.SupplierbaseService;
-import org.nl.wms.basedata.master.service.dto.ClassstandardDto;
-import org.nl.wms.basedata.master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.master.service.SupplierbaseService;
+import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.dto.SupplierbaseDto;
 
 
 
@@ -29,7 +28,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/UnitServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.master.service.impl;
+package org.nl.wms.masterdata_manage.master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -10,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.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.basedata.master.service.UnitService;
-import org.nl.wms.basedata.master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.master.service.UnitService;
+import org.nl.wms.masterdata_manage.master.service.dto.UnitDto;
 
 
 
@@ -26,7 +25,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/rest/WorkProcedureController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.basedata.pdm.rest;
+package org.nl.wms.masterdata_manage.pdm.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.basedata.pdm.service.WorkProcedureService;
-import org.nl.wms.basedata.pdm.service.dto.WorkProcedureDto;
+import org.nl.wms.masterdata_manage.pdm.service.WorkProcedureService;
+import org.nl.wms.masterdata_manage.pdm.service.dto.WorkProcedureDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -22,10 +22,10 @@ import java.util.Map;
  * @author ldjun
  * @date 2021-12-19
  **/
-@RestController
+//@RestController
 @RequiredArgsConstructor
-@Api(tags = "工序管理")
-@RequestMapping("/api/workProcedure")
+//@Api(tags = "工序管理")
+//@RequestMapping("/api/workProcedure")
 @Slf4j
 public class WorkProcedureController {
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/WorkProcedureService.java

@@ -1,9 +1,8 @@
 
-package org.nl.wms.basedata.pdm.service;
+package org.nl.wms.masterdata_manage.pdm.service;
 
 import com.alibaba.fastjson.JSONArray;
-import org.nl.wms.basedata.pdm.service.dto.WorkProcedureDto;
-import org.nl.wms.st.out.service.dto.WorkprocedureDto;
+import org.nl.wms.masterdata_manage.pdm.service.dto.WorkProcedureDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
@@ -83,6 +82,6 @@ public interface WorkProcedureService {
      * @param
      * @return List<PdmBaseWorkprocedureDto>
      */
-    List<WorkprocedureDto> queryWorkprocedure();
+    List<WorkProcedureDto> queryWorkprocedure();
 
 }