From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 08 三月 2025 09:06:55 +0800
Subject: [PATCH] CUT库条码T开头，截取后10位
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java | 688 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 386 insertions(+), 302 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java
index fd97a50..07ca0ad 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetlLog.java
@@ -1,302 +1,386 @@
-package com.zy.asrs.wms.asrs.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.wms.asrs.service.MatService;
-import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
-import com.zy.asrs.wms.asrs.service.OrderLogService;
-import com.zy.asrs.wms.asrs.service.TaskLogService;
-import com.zy.asrs.wms.system.entity.Host;
-import com.zy.asrs.wms.system.entity.User;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wms.system.service.UserService;
-import com.zy.asrs.wms.system.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("man_task_detl_log")
-public class TaskDetlLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 浠诲姟ID
- */
- @ApiModelProperty(value= "浠诲姟ID")
- private Long taskId;
-
- /**
- * 浠诲姟缂栧彿
- */
- @ApiModelProperty(value= "浠诲姟缂栧彿")
- private String taskNo;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 搴撳瓨
- */
- @ApiModelProperty(value= "搴撳瓨")
- private Double stock;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鎵樼洏鐮�
- */
- @ApiModelProperty(value= "鎵樼洏鐮�")
- private String barcode;
-
- /**
- * 璁㈠崟ID
- */
- @ApiModelProperty(value= "璁㈠崟ID")
- private Long orderId;
-
- /**
- * 璁㈠崟缂栧彿
- */
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
- private String orderNo;
-
- /**
- * 鏄庣粏ID
- */
- @ApiModelProperty(value= "鏄庣粏ID")
- private Long detlId;
-
- /**
- * 鐗╂枡ID
- */
- @ApiModelProperty(value= "鐗╂枡ID")
- private Long matId;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value= "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
- private Integer deleted;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public TaskDetlLog() {}
-
- public TaskDetlLog(Long taskId,String taskNo,Double anfme,Double stock,String batch,String barcode,Long orderId,String orderNo,Long detlId,Long matId,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
- this.taskId = taskId;
- this.taskNo = taskNo;
- this.anfme = anfme;
- this.stock = stock;
- this.batch = batch;
- this.barcode = barcode;
- this.orderId = orderId;
- this.orderNo = orderNo;
- this.detlId = detlId;
- this.matId = matId;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
-// TaskDetlLog taskDetlLog = new TaskDetlLog(
-// null, // 浠诲姟ID
-// null, // 浠诲姟缂栧彿
-// null, // 鏁伴噺
-// null, // 搴撳瓨
-// null, // 鎵瑰彿
-// null, // 鎵樼洏鐮�
-// null, // 璁㈠崟ID
-// null, // 璁㈠崟缂栧彿
-// null, // 鏄庣粏ID
-// null, // 鐗╂枡ID
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getTaskId$(){
- TaskLogService service = SpringUtils.getBean(TaskLogService.class);
- TaskLog taskLog = service.getById(this.taskId);
- if (!Cools.isEmpty(taskLog)){
- return String.valueOf(taskLog.getId());
- }
- return null;
- }
-
- public String getOrderId$(){
- OrderLogService service = SpringUtils.getBean(OrderLogService.class);
- OrderLog orderLog = service.getById(this.orderId);
- if (!Cools.isEmpty(orderLog)){
- return String.valueOf(orderLog.getId());
- }
- return null;
- }
-
- public String getDetlId$(){
- OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
- OrderDetlLog orderDetlLog = service.getById(this.detlId);
- if (!Cools.isEmpty(orderDetlLog)){
- return String.valueOf(orderDetlLog.getId());
- }
- return null;
- }
-
- public String getMatId$(){
- MatService service = SpringUtils.getBean(MatService.class);
- Mat mat = service.getById(this.matId);
- if (!Cools.isEmpty(mat)){
- return String.valueOf(mat.getId());
- }
- return null;
- }
-
- public String getHostId$(){
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.getById(this.hostId);
- if (!Cools.isEmpty(host)){
- return String.valueOf(host.getName());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.wms.asrs.service.MatService;
+import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
+import com.zy.asrs.wms.asrs.service.OrderLogService;
+import com.zy.asrs.wms.asrs.service.TaskLogService;
+import com.zy.asrs.wms.system.entity.Host;
+import com.zy.asrs.wms.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_task_detl_log")
+public class TaskDetlLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠诲姟ID
+ */
+ @ApiModelProperty(value= "浠诲姟ID")
+ private Long taskId;
+
+ /**
+ * 浠诲姟缂栧彿
+ */
+ @ApiModelProperty(value= "浠诲姟缂栧彿")
+ private String taskNo;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 搴撳瓨
+ */
+ @ApiModelProperty(value= "搴撳瓨")
+ private Double stock;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String barcode;
+
+ /**
+ * 璁㈠崟ID
+ */
+ @ApiModelProperty(value= "璁㈠崟ID")
+ private Long orderId;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ private String orderNo;
+
+ /**
+ * 鏄庣粏ID
+ */
+ @ApiModelProperty(value= "鏄庣粏ID")
+ private Long detlId;
+
+ /**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty(value= "鐗╂枡ID")
+ private Long matId;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public TaskDetlLog() {}
+
+ public TaskDetlLog(Long taskId,String taskNo,Double anfme,Double stock,String batch,String barcode,Long orderId,String orderNo,Long detlId,Long matId,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.taskId = taskId;
+ this.taskNo = taskNo;
+ this.anfme = anfme;
+ this.stock = stock;
+ this.batch = batch;
+ this.barcode = barcode;
+ this.orderId = orderId;
+ this.orderNo = orderNo;
+ this.detlId = detlId;
+ this.matId = matId;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// TaskDetlLog taskDetlLog = new TaskDetlLog(
+// null, // 浠诲姟ID
+// null, // 浠诲姟缂栧彿
+// null, // 鏁伴噺
+// null, // 搴撳瓨
+// null, // 鎵瑰彿
+// null, // 鎵樼洏鐮�
+// null, // 璁㈠崟ID
+// null, // 璁㈠崟缂栧彿
+// null, // 鏄庣粏ID
+// null, // 鐗╂枡ID
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getTaskId$(){
+ TaskLogService service = SpringUtils.getBean(TaskLogService.class);
+ TaskLog taskLog = service.getById(this.taskId);
+ if (!Cools.isEmpty(taskLog)){
+ return String.valueOf(taskLog.getId());
+ }
+ return null;
+ }
+
+ public String getOrderId$(){
+ OrderLogService service = SpringUtils.getBean(OrderLogService.class);
+ OrderLog orderLog = service.getById(this.orderId);
+ if (!Cools.isEmpty(orderLog)){
+ return String.valueOf(orderLog.getId());
+ }
+ return null;
+ }
+
+ public String getDetlId$(){
+ OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
+ OrderDetlLog orderDetlLog = service.getById(this.detlId);
+ if (!Cools.isEmpty(orderDetlLog)){
+ return String.valueOf(orderDetlLog.getId());
+ }
+ return null;
+ }
+
+ public String getMatId$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getById(this.matId);
+ if (!Cools.isEmpty(mat)){
+ return String.valueOf(mat.getId());
+ }
+ return null;
+ }
+
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getById(this.matId);
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ return null;
+ }
+
+ public TaskLog getTask$(){
+ TaskLogService service = SpringUtils.getBean(TaskLogService.class);
+ TaskLog taskLog = service.getById(this.getTaskId());
+ if (!Cools.isEmpty(taskLog)){
+ return taskLog;
+ }
+ return null;
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+ //鍔ㄦ�佹墿灞曞瓧娈�
+ public transient Map<String, Object> dynamicFields = new HashMap<>();
+
+ @JsonAnyGetter
+ public Map<String,Object> getDynamicFields() {
+ return dynamicFields;
+ }
+
+ public void syncField(List<TaskDetlFieldLog> list) {
+ ArrayList<String> keys = new ArrayList<>();
+ Field[] fields = this.getClass().getFields();
+ for (Field field : fields) {
+ keys.add(field.getName());
+ }
+
+ Map<String, Object> dynamicFields = new HashMap<>();
+ for (TaskDetlFieldLog taskDetlFieldLog : list) {
+ if (keys.contains(taskDetlFieldLog.getName())) {
+ continue;
+ }
+ dynamicFields.put(taskDetlFieldLog.getName(), taskDetlFieldLog.getValue());
+ }
+
+ this.dynamicFields = dynamicFields;
+ }
+
+ public void syncFieldMap(Map<String, Object> map) {
+ ArrayList<String> keys = new ArrayList<>();
+ Field[] fields = this.getClass().getDeclaredFields();
+ for (Field field : fields) {
+ keys.add(field.getName());
+ }
+ keys.add("detlId");
+
+ Map<String, Object> dynamicFields = new HashMap<>();
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ if (keys.contains(entry.getKey())) {
+ continue;
+ }
+ dynamicFields.put(entry.getKey(), entry.getValue());
+ }
+
+ this.dynamicFields = dynamicFields;
+ }
+
+ public String getFieldString(String key) {
+ return dynamicFields.get(key).toString();
+ }
+
+ public void setField(String key, Object value) {
+ dynamicFields.put(key, value);
+ }
+
+}
--
Gitblit v1.9.1