add: 初始化

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java

@@ -152,5 +152,6 @@ public class SysMenu implements Serializable {
     /**
      * 是否PC菜单
      */
+    @TableField(exist = false)
     private String is_pc;
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java

@@ -47,7 +47,7 @@ public class SysRole implements Serializable {
     /**
      * id名称
      */
-    private String id_name;
+    private String in_name;
 
     /**
      * 角色级别

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/impl/MdMeMaterialbaseServiceImpl.java

@@ -110,7 +110,7 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
                 //.set("update_optid", SecurityUtils.getCurrentUserId())
                 //.set("update_optname", SecurityUtils.getCurrentNickName())
                 //.set("update_time", DateUtil.now())
-                .in("id", ids);
+                .in("material_code", ids);
         mdMeMaterialbaseMapper.update(null, updateWrapper);
     }
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java

@@ -8,4 +8,10 @@ import com.alibaba.fastjson.JSONObject;
  * @Date: 2023/8/3
  */
 public interface MesToWmsService {
+
+
+    /**
+     * 获取工单信息
+     */
+    public void getWorkOrderInfo(JSONObject entity);
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java

@@ -1,7 +1,10 @@
 package org.nl.wms.ext.mes.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.exception.BadRequestException;
 import org.nl.wms.ext.mes.service.MesToWmsService;
 import org.springframework.stereotype.Service;
 
@@ -13,4 +16,45 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class MesToWmsServiceImpl implements MesToWmsService {
+
+
+
+    @Override
+    public void getWorkOrderInfo(JSONObject entity) {
+        try{
+            boolean notEmpty = ObjectUtil.isNotEmpty(entity);
+            if(notEmpty){
+                log.info("getWorkOrderInfo获取工单信息:{}",entity);
+                //客户信息
+                String cust = entity.getString("cust");
+                //打印标签模板信息
+                String template = entity.getString("template");
+                //包装信息
+                String wrap = entity.getString("wrap");
+                //是否人工贴物料标/箱标
+                String labeling = entity.getString("labeling");
+                //是否装冰
+                String ice = entity.getString("ice");
+                if(StrUtil.isEmpty(cust)){
+                    throw new BadRequestException("客户信息不能为空");
+                }
+                if(StrUtil.isEmpty(template)){
+                    throw new BadRequestException("标签模板不能为空");
+                }
+                if(StrUtil.isEmpty(wrap)){
+                    throw new BadRequestException("包装信息不能为空");
+                }
+                if(StrUtil.isEmpty(labeling)){
+                    throw new BadRequestException("是否人工贴物料标/箱标不能为空");
+                }
+                if(StrUtil.isEmpty(ice)){
+                    throw new BadRequestException("是否装冰不能为空");
+                }
+            }else{
+                log.info("获取工单信息失败");
+            }
+        }catch (Exception e){
+            log.error("获取工单信息失败",e);
+        }
+    }
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java

@@ -125,12 +125,16 @@ public class SchBasePoint implements Serializable {
 
 
     private String update_time;
+    @TableField(exist = false)
     private String source_id;
     /** 物料编码 */
+    @TableField(exist = false)
     private String material_code;
     /** 位置 */
+    @TableField(exist = false)
     private String point_location;
     /** 锁定类型 */
+    @TableField(exist = false)
     private String lock_type;
 
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java

@@ -1,6 +1,7 @@
 package org.nl.wms.sch.region.service.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -22,46 +23,46 @@ public class SchBaseRegion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "region_code", type = IdType.NONE)
-    
+
     private String region_code;
 
-    
+
     private String region_name;
 
-    
+
     private String point_type_explain;
 
-    
+
     private String point_status_explain;
 
-    
+
     private Boolean is_has_workder;
 
-    
+
     private String workshop_code;
 
-    
+
     private String remark;
 
-    
+
     private String create_id;
 
-    
+
     private String create_name;
 
-    
+
     private String create_time;
 
-    
+    @TableField(exist = false)
     private String update_optid;
 
-    
+    @TableField(exist = false)
     private String update_optname;
 
-    
+
     private String update_time;
 
-    
+
     private Integer order_seq;
 
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java

@@ -42,6 +42,7 @@ public class SchBaseTaskconfig implements Serializable {
 
 
     private String acs_task_type;
+    @TableField(exist = false)
     private String agv_system_type;
 
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml

@@ -8,8 +8,8 @@
         tc.config_name,
         tc.task_name,
         tc.priority,
-        tc.acs_task_type,
-        tc.agv_system_type
+        tc.acs_task_type
+        /*tc.agv_system_type*/
         FROM
         `sch_base_task` t
         LEFT JOIN sch_base_taskconfig tc ON tc.config_code = t.config_code