From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 593 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 338 insertions(+), 255 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 58cbe5b..45dd553 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -2,16 +2,22 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.KcztMapService;
+import com.zy.asrs.service.StoreTypeService;
+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 java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_wrk_detl")
public class WrkDetl implements Serializable {
@@ -20,356 +26,433 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
/**
- * 鐗╂枡
- */
- @ApiModelProperty(value= "鐗╂枡")
- private String matnr;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "浠撳簱鍙�")
- private String lgnum;
-
- /**
- * 杞偍璇锋眰缂栧彿
- */
- @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
- private Integer tbnum;
-
- /**
- * 琛岄」鐩�
- */
- @ApiModelProperty(value= "琛岄」鐩�")
- private Integer tbpos;
-
- /**
- * 鐗╂枡鏍囩ID
- */
- @ApiModelProperty(value= "鐗╂枡鏍囩ID")
- private String zmatid;
-
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
-
- /**
- * 宸ュ巶
- */
- @ApiModelProperty(value= "宸ュ巶")
- private String werks;
-
- /**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String altme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
- * 鐢ㄦ埛ID
+ * 鐗╂枡
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
- private String bname;
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+ private String matnr;
/**
- * 澶囨敞
+ * 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value = "闀垮害")
+ @TableField("man_length")
+ private Double manLength;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value = "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
- private Double nista;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
- public WrkDetl() {}
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ private String standby1 = "";
- public WrkDetl(Integer wrkNo,Date ioTime,String matnr,String lgnum,Integer tbnum,Integer tbpos,String zmatid,String maktx,String werks,Double anfme,String altme,String zpallet,String bname,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double nista) {
- this.wrkNo = wrkNo;
- this.ioTime = ioTime;
- this.matnr = matnr;
- this.lgnum = lgnum;
- this.tbnum = tbnum;
- this.tbpos = tbpos;
- this.zmatid = zmatid;
- this.maktx = maktx;
- this.werks = werks;
- this.anfme = anfme;
- this.altme = altme;
- this.zpallet = zpallet;
- this.bname = bname;
- this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.nista = nista;
- }
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ private String standby2 = "";
-// WrkDetl wrkDetl = new WrkDetl(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鏃堕棿
-// null, // 鐗╂枡[闈炵┖]
-// null, // 浠撳簱鍙穂闈炵┖]
-// null, // 杞偍璇锋眰缂栧彿[闈炵┖]
-// null, // 琛岄」鐩甗闈炵┖]
-// null, // 鐗╂枡鏍囩ID[闈炵┖]
-// null, // 鐗╂枡鎻忚堪
-// null, // 宸ュ巶
-// null, // 鏁伴噺
-// null, // 鍗曚綅
-// null, // 鎵樼洏鏉＄爜
-// null, // 鐢ㄦ埛ID
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null //
-// );
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ private String standby3 = "";
- public Integer getWrkNo() {
- return wrkNo;
- }
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "";
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "";
- public Date getIoTime() {
- return ioTime;
- }
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "";
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ /**
+ * 搴撳瓨
+ */
+ @ApiModelProperty(value = "搴撳瓨")
+ @TableField("stock_num")
+ private Double stockNum;
+
+ /**
+ * 寮�绁ㄥ鎴峰悕绉�
+ */
+ @ApiModelProperty(value = "寮�绁ㄥ鎴峰悕绉�")
+ @TableField("kp_cstmr_name")
+ private String kpCstmrName;
+
+ /**
+ * 杈呭簱瀛�
+ */
+ @ApiModelProperty(value = "杈呭簱瀛�")
+ @TableField("stock_num2")
+ private Double stockNum2;
+
+ //搴撳瓨鐘舵��
+ private String cstateid;
+
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
}
- public String getMatnr() {
- return matnr;
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
}
- public void setMatnr(String matnr) {
- this.matnr = matnr;
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
}
- public String getLgnum() {
- return lgnum;
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
}
- public void setLgnum(String lgnum) {
- this.lgnum = lgnum;
- }
-
- public Integer getTbnum() {
- return tbnum;
- }
-
- public void setTbnum(Integer tbnum) {
- this.tbnum = tbnum;
- }
-
- public Integer getTbpos() {
- return tbpos;
- }
-
- public void setTbpos(Integer tbpos) {
- this.tbpos = tbpos;
- }
-
- public String getZmatid() {
- return zmatid;
- }
-
- public void setZmatid(String zmatid) {
- this.zmatid = zmatid;
- }
-
- public String getMaktx() {
- return maktx;
- }
-
- public void setMaktx(String maktx) {
- this.maktx = maktx;
- }
-
- public String getWerks() {
- return werks;
- }
-
- public void setWerks(String werks) {
- this.werks = werks;
- }
-
- public Double getAnfme() {
- return anfme;
- }
-
- public void setAnfme(Double anfme) {
- this.anfme = anfme;
- }
-
- public String getAltme() {
- return altme;
- }
-
- public void setAltme(String altme) {
- this.altme = altme;
- }
-
- public String getZpallet() {
- return zpallet;
- }
-
- public void setZpallet(String zpallet) {
- this.zpallet = zpallet;
- }
-
- public String getBname() {
- return bname;
- }
-
- public void setBname(String bname) {
- this.bname = bname;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
+ public String getStandby1$() {
+ StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+ StoreType storeType = service.selectById(this.standby1);
+ if (!Cools.isEmpty(storeType)) {
+ return String.valueOf(storeType.getStoreName());
+ }
+ return null;
}
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
+ public String getCstateid$() {
+ KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+ KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+ if (!Cools.isEmpty(kcztMap)){
+ return String.valueOf(kcztMap.getVname());
+ }
+ return String.valueOf(this.cstateid);
}
- public Double getNista() {
- return nista;
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
}
-
- public void setNista(Double nista) {
- this.nista = nista;
- }
-
}
--
Gitblit v1.9.1