表结构修改、枚举类位置迁移

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

@@ -1,4 +1,4 @@
-package org.nl.wms.enums;
+package org.nl.common.enums;
 
 /**
  * @Author: lyd

mes/hd/nladmin-system/src/main/java/org/nl/wms/enums/PointEnum.java

@@ -1,27 +0,0 @@
-package org.nl.wms.enums;
-
-/**
- * @Author: lyd
- * @Description: 点位枚举
- * @Date: 2023/3/20
- */
-public enum PointEnum {
-    LOCK_TYPE_OFF("未锁定", "0"),
-    LOCK_TYPE_ON("锁定", "1");
-
-    private final String name;
-    private final String code;
-
-    PointEnum(String name, String code) {
-        this.name = name;
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getCode() {
-        return code;
-    }
-}

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java

@@ -25,7 +25,7 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.system.service.user.ISysUserService;
 import org.nl.system.service.user.dao.SysUser;
 import org.nl.wms.basedata.master.service.ClassstandardService;
-import org.nl.wms.enums.WorkerOrderEnum;
+import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.mps.service.ProduceWorkorderService;
 import org.nl.wms.mps.service.WorkOrderImportEnum;

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

@@ -8,16 +8,14 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.mchange.lang.DoubleUtils;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.enums.StatusEnum;
 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.enums.PointEnum;
 import org.nl.wms.sch.service.PointService;
 import org.nl.wms.sch.service.RegionService;
 import org.nl.wms.sch.service.dto.PointDto;
@@ -27,8 +25,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -316,8 +312,8 @@ public class PointServiceImpl implements PointService {
         String lock = jsonObject.getString("lock_type");
         for ( int i = 0; i < data.size(); i++ ) {
             JSONObject object = data.getJSONObject(i);
-            if (lock.equals(PointEnum.LOCK_TYPE_OFF.getCode())) object.put("lock_type", PointEnum.LOCK_TYPE_OFF.getCode());
-            else object.put("lock_type", PointEnum.LOCK_TYPE_ON.getCode());
+            if (lock.equals(StatusEnum.LOCK_OFF.getCode())) object.put("lock_type", StatusEnum.LOCK_OFF.getCode());
+            else object.put("lock_type", StatusEnum.LOCK_ON.getCode());
             wo.update(object);
         }
     }