From e62569856fdfb0c7c31ee88cf96628af08eabf85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 12:34:15 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/common/config/AdminInterceptor.java | 7 ++
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 4
src/main/java/com/zy/asrs/entity/OrderPakout.java | 4
src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/java/com/zy/system/timer/LoadingConfigTimer.java | 6 +
src/main/java/com/zy/asrs/entity/Mat.java | 4
src/main/java/com/zy/asrs/entity/OrderLog.java | 4
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4
src/main/resources/application-dev.yml | 2
src/main/webapp/static/js/common.js | 5 +
src/main/webapp/static/js/orderPakin/order.js | 3
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 4
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 4
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 1
src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java | 4
src/main/java/com/zy/asrs/entity/OrderPakin.java | 4
src/main/java/com/zy/asrs/entity/Order.java | 4
src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java | 4
src/main/java/com/zy/asrs/entity/OrderPakinLog.java | 4
src/main/java/com/zy/asrs/entity/WaitPakin.java | 2
src/main/webapp/static/js/orderPakout/order.js | 3
src/main/java/com/zy/asrs/entity/LocDetl.java | 49 +++++++++++++---
src/main/java/com/zy/asrs/entity/OrderPakoutLog.java | 4
src/main/java/com/zy/asrs/entity/result/LocDetlAll.java | 4
src/main/resources/application.yml | 2
26 files changed, 95 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index a0a5065..9d064bd 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -12,12 +13,12 @@
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.LocOwnerService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -31,42 +32,49 @@
private static final long serialVersionUID = 1L;
- @TableId
- private Long id;
-
+ @TableId(value = "loc_id", type = IdType.AUTO)
@TableField("loc_id")
private Long locId;
+
@ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
@ApiModelProperty("area_id")
+ @TableField
private Long areaId;
@ApiModelProperty("area_name")
+ @TableField
private String areaName;
@ApiModelProperty(value = "鎵樼洏鏉＄爜")
+ @TableField
private String zpallet;
@ApiModelProperty(value = "鏁伴噺")
+ @TableField
@ExcelProperty("鏁伴噺")
private Double anfme;
@ApiModelProperty(value = "鍟嗗搧缂栧彿")
+ @TableField
@ExcelProperty("鍟嗗搧缂栧彿")
private String matnr;
@ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ @TableField
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
@ApiModelProperty(value = "瑙勬牸")
+ @TableField
@ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value = "璐у搧鐗瑰緛")
+ @TableField
@ExcelProperty("璐у搧鐗瑰緛")
private String batch;
@@ -76,33 +84,43 @@
private String orderNo;
@ApiModelProperty(value = "鍨嬪彿")
+ @TableField
private String model;
@ApiModelProperty(value = "棰滆壊")
+ @TableField
private String color;
@ApiModelProperty(value = "鍝佺墝")
+ @TableField
private String brand;
@ApiModelProperty(value = "鍗曚綅")
+ @TableField
private String unit;
@ApiModelProperty(value = "鍗曚环")
+ @TableField
private Double price;
@ApiModelProperty(value = "sku")
+ @TableField
private String sku;
@ApiModelProperty(value = "鍗曚綅閲�")
+ @TableField
private Double units;
@ApiModelProperty(value = "鏉＄爜")
+ @TableField
private String barcode;
@ApiModelProperty(value = "浜у湴")
+ @TableField
private String origin;
@ApiModelProperty(value = "鍘傚")
+ @TableField
private String manu;
@ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@@ -118,12 +136,15 @@
private Double safeQty;
@ApiModelProperty(value = "閲嶉噺")
+ @TableField
private Double weight;
@ApiModelProperty(value = "闀垮害")
- private Double man_length;
+ @TableField(value = "man_length")
+ private Double manLength;
@ApiModelProperty(value = "浣撶Н")
+ @TableField
private Double volume;
@ApiModelProperty(value = "涓夋柟缂栫爜")
@@ -131,6 +152,7 @@
private String threeCode;
@ApiModelProperty(value = "渚涘簲鍟�")
+ @TableField
private String supp;
@ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@@ -150,12 +172,15 @@
private Integer deadWarn;
@ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @TableField
private Integer source;
@ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @TableField
private Integer inspect;
@ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @TableField
private Integer danger;
@ApiModelProperty(value = "淇敼浜哄憳")
@@ -175,30 +200,35 @@
private Date appeTime;
@ApiModelProperty(value = "澶囨敞")
+ @TableField
private String memo;
/**
* 鎷ユ湁鑰�
*/
@ApiModelProperty(value = "鎷ユ湁鑰� 1: 鏉板厠 ")
+ @TableField
private Integer owner;
/**
* 澶囩敤1
*/
@ApiModelProperty(value = "澶囩敤1")
+ @TableField
private String standby1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value = "澶囩敤2")
+ @TableField
private String standby2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value = "澶囩敤3")
+ @TableField
private String standby3 = "";
/**
@@ -206,26 +236,27 @@
*/
@ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
/**
* 鏄惁鍐荤粨
*/
@ApiModelProperty(value = "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+ @TableField
private Integer frozen;
public String getLocNo$() {
@@ -347,7 +378,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
public String getFrozen$() {
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 43cc500..a3de2d9 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -9,11 +9,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.enums.ContainerType;
import com.zy.asrs.service.TagService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -547,7 +547,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 3979879..f0784c8 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -527,7 +527,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index b521c73..12e97b1 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -10,11 +10,11 @@
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -575,7 +575,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java
index bfed386..1a5ab5a 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java
@@ -10,11 +10,11 @@
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -575,7 +575,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index d78951b..8ba546c 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -10,11 +10,11 @@
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -574,7 +574,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java
index a8df34e..7482b6c 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java
@@ -10,11 +10,11 @@
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -574,7 +574,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderLog.java b/src/main/java/com/zy/asrs/entity/OrderLog.java
index 234a9dd..387a427 100644
--- a/src/main/java/com/zy/asrs/entity/OrderLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderLog.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -564,7 +564,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakin.java b/src/main/java/com/zy/asrs/entity/OrderPakin.java
index a88c89f..4a395d5 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakin.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -486,7 +486,7 @@
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
index 7123341..a61321b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -488,7 +488,7 @@
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index 1edce52..a9ee821 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -488,7 +488,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
index 32757ce..cba4446 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -488,7 +488,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index c6bee3f..e6fce74 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -289,6 +289,6 @@
}
// public void sync(Object source) {
-// Synchro.Copy(source, this);
+// BeanUtils.copyProperties(source, this);
// }
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 6fe4a9e..e3e8f8a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -4,12 +4,12 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -409,7 +409,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 2beb58f..5eb85f4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -407,6 +407,6 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java b/src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java
index 6063621..bbba653 100644
--- a/src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AbnormalLocDetlParam.java
@@ -7,11 +7,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.LocMastService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -276,7 +276,7 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java b/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
index 02d2db1..27fb73d 100644
--- a/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
@@ -5,8 +5,8 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.service.LocOwnerService;
-import com.zy.common.utils.Synchro;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import java.util.Date;
@@ -54,6 +54,6 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 9ebdf73..e443df3 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -23,6 +23,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.web.WcsController;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -993,7 +994,7 @@
}
Mat mat = matService.selectByMatnr(adjust.getMatnr());
LocDetl locDetl = new LocDetl();
- locDetl.sync(mat);
+ BeanUtils.copyProperties(mat, locDetl);
locDetl.setBatch(adjust.getBatch());
locDetl.setLocNo(locMast.getLocNo());
locDetl.setZpallet(locMast.getBarcode());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index bc20503..d1336b3 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -688,7 +688,6 @@
.setAppeTime(new Date())
.setSpecs(pakin.getSpecs())
.setColor(pakin.getColor())
- .setLocId(locCache.getId())
.setLocNo(locCache.getLocNo())
.setAreaId(locCache.getAreaId())
.setAreaName(locCache.getAreaName())
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 93de709..52ccccf 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -9,6 +9,7 @@
import com.zy.common.utils.Http;
import com.zy.system.entity.*;
import com.zy.system.service.*;
+import com.zy.system.timer.LicenseTimer;
import com.zy.system.timer.LoadingConfigTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -43,6 +44,8 @@
private RolePermissionService rolePermissionService;
@Autowired
private LoadingConfigTimer loadingConfigTimer;
+ @Autowired
+ private LicenseTimer licenseTimer;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -50,6 +53,10 @@
if (handler instanceof org.springframework.web.servlet.resource.ResourceHttpRequestHandler) {
return true;
}
+ if (!licenseTimer.getSystemSupport()) {
+ Http.response(response, BaseRes.NO_ACTIVATION);
+ return false;
+ }
// super璐﹀彿
String token = request.getHeader("token");
if (token != null) {
diff --git a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
index 8843d89..e9760c4 100644
--- a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
+++ b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
@@ -27,6 +27,10 @@
* 鍒犻櫎澶╂暟
*/
private Integer logDeleteDays = 360;
+ /**
+ * 鎵樼洏鐮佹槸鍚︾鐞�
+ */
+ private Boolean zpalletManage = false;
// erp涓婃姤
private Boolean erpReport = false;
@@ -41,7 +45,7 @@
tokenNumber = configService.getVal("tokenNumber", Integer.class, tokenNumber);
logDeleteDays = configService.getVal("logDeleteDays", Integer.class, logDeleteDays);
erpReport = configService.getVal("erpReport", Boolean.class, erpReport);
-
+ zpalletManage = configService.getVal("zpalletManage", Boolean.class, zpalletManage);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e9c3c80..cbdf8e9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -44,7 +44,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: integrationasrs
+ subject: asrs2.0
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 993ee9d..44813d0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,4 +3,4 @@
active: dev
logging:
file:
- path: /stock/out/@pom.build.finalName@/logs
\ No newline at end of file
+ path: /stock/out/wms/logs
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4d9623f..5fbd480 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -189,7 +189,10 @@
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'upQty', align: 'center',title: '缁勬墭涓婇檺'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'storeMax', align: 'center',title: '搴撳瓨棰勮鏁伴噺涓婇檺'}
+ ,{field: 'storeMin', align: 'center',title: '搴撳瓨棰勮鏁伴噺涓嬮檺'}
+ ,{field: 'storeMaxDate', align: 'center',title: '搴撻緞棰勮涓婇檺'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 6b38ea5..2492f3e 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -17,7 +17,8 @@
url: baseUrl+"/docType/list/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- limit: 9999
+ limit: 9999,
+ pakin: 1
},
method: 'POST',
success: function (res) {
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index bedb1f0..eddda0f 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -17,7 +17,8 @@
url: baseUrl+"/docType/list/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- limit: 9999
+ limit: 9999,
+ pakout: 1
},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1