From 30c587a6859faa6cdcb8dc1f4e963653777d236d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 七月 2022 12:56:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 51 -
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2
src/main/resources/mapper/WaitPakinMapper.xml | 44 +
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 13
src/main/resources/mapper/LocDetlMapper.xml | 62 +
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 18
/dev/null | 48 -
src/main/resources/mapper/WrkDetlMapper.xml | 49 +
src/main/java/com/zy/asrs/entity/WaitPakin.java | 247 +++++---
src/main/java/com/zy/asrs/entity/LocDetl.java | 234 +++++--
src/main/java/com/zy/common/utils/Synchro.java | 38 +
src/main/java/com/zy/asrs/mapper/MatMapper.java | 15
src/main/resources/mapper/MatMapper.xml | 53 +
src/main/java/com/zy/asrs/entity/Mat.java | 485 ++++++++++++++++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 313 ++++++++--
src/main/resources/application.yml | 2
src/main/java/com/zy/asrs/service/MatService.java | 10
17 files changed, 1,293 insertions(+), 391 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 9899b48..ea03d50 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -1,14 +1,13 @@
package com.zy.asrs.entity;
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.zy.asrs.service.LocMastService;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+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;
@@ -22,57 +21,114 @@
private static final long serialVersionUID = 1L;
-
@ApiModelProperty(value= "搴撲綅鍙�")
- @TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
-
- @ApiModelProperty(value= "浜у搧缂栫爜")
- @TableId(value = "mat_no", type = IdType.INPUT)
- @TableField("mat_no")
- private String matNo;
-
- @ApiModelProperty(value= "浜у搧鍚嶇О")
- @TableId(value = "mat_name")
- @TableField("mat_name")
- private String matName;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- @ApiModelProperty(value= "灏哄")
- private String size;
-
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- @ApiModelProperty(value= "鍗曢噸")
- private Double weight;
-
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supplier;
-
- @ApiModelProperty(value= "浠撳簱")
- private String warehouse;
-
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- @ApiModelProperty(value= "鏁伴噺")
- private Double qty;
-
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
- @ApiModelProperty(value= "鐢ㄦ埛ID")
- private String bname;
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ @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;
+
+ @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= "闀垮害")
+ private Double length;
+
+ @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;
+
+ @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;
+
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
@ApiModelProperty(value= "淇敼浜哄憳")
@TableField("modi_user")
@@ -90,30 +146,8 @@
@TableField("appe_time")
private Date appeTime;
- @TableField("bill_no")
- private String billNo;
-
- @TableField("seq_no")
- private int seqNo;
-
- @TableField("bill_type")
- private int billType;
-
- @TableField("object_id")
- private String objectId;
-
- @TableField("object_name")
- private String objectName;
-
- @TableField("det_id")
- private int detId;
-
- @TableId(value = "Item_batch", type = IdType.INPUT)
- @TableField("Item_batch")
- private String itemBatch;
-
- @TableField("order_no")
- private String orderNo;
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -122,6 +156,56 @@
return String.valueOf(locMast.getLocNo());
}
return null;
+ }
+
+ 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 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 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 getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
}
public String getModiUser$(){
@@ -140,7 +224,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
-
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
@@ -156,4 +239,9 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
new file mode 100644
index 0000000..909108a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -0,0 +1,485 @@
+package com.zy.asrs.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+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.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_mat")
+public class Mat implements Serializable {
+
+ @TableField(exist = false)
+ private Double stock;
+
+ public Double getStock() {
+ return stock;
+ }
+
+ public void setStock(Double stock) {
+ this.stock = stock;
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 鎵�灞炲綊绫�
+ */
+ @ApiModelProperty(value= "鎵�灞炲綊绫�")
+ @TableField("tag_id")
+ private Long tagId;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ExcelProperty(value = "鍟嗗搧缂栫爜")
+ private String matnr;
+
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ExcelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鍒悕
+ */
+ @ApiModelProperty(value= "鍒悕")
+ @ExcelProperty(value = "鍒悕")
+ private String name;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty(value = "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value= "鍨嬪彿")
+ @ExcelProperty(value = "鍨嬪彿")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value= "棰滆壊")
+ @ExcelProperty(value = "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ @ExcelProperty(value = "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value= "鍗曚綅")
+ @ExcelProperty(value = "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value= "鍗曚环")
+ @ExcelProperty(value = "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ @ExcelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ @ExcelProperty(value = "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @ExcelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value= "浜у湴")
+ @ExcelProperty(value = "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value= "鍘傚")
+ @ExcelProperty(value = "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ExcelProperty(value = "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value= "鍝侀」鏁�")
+ @ExcelProperty(value = "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty(value = "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ @ExcelProperty(value = "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ @ExcelProperty(value = "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ExcelProperty(value = "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ @ExcelProperty(value = "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ @ExcelProperty(value = "淇濊川鏈�")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ @ExcelProperty(value = "棰勮澶╂暟")
+ 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;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ @ExcelProperty(value = "澶囨敞")
+ private String memo;
+
+ public Mat() {}
+
+ public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.uuid = uuid;
+ this.tagId = tagId;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.name = name;
+ this.specs = specs;
+ this.model = model;
+ this.color = color;
+ this.brand = brand;
+ this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
+ this.barcode = barcode;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
+ this.itemNum = itemNum;
+ this.safeQty = safeQty;
+ this.weight = weight;
+ this.length = length;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.beBatch = beBatch;
+ this.deadTime = deadTime;
+ this.deadWarn = deadWarn;
+ this.source = source;
+ this.inspect = inspect;
+ this.danger = danger;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// Mat mat = new Mat(
+// null, // 缂栧彿
+// null, // 鎵�灞炲綊绫�
+// null, // 鍟嗗搧缂栧彿
+// null, // 鍟嗗搧鍚嶇О
+// null, // 鍒悕
+// null, // 瑙勬牸
+// null, // 鍨嬪彿
+// null, // 棰滆壊
+// null, // 鍝佺墝
+// null, // 鍗曚綅
+// null, // 鍗曚环
+// null, // sku
+// null, // 鍗曚綅閲�
+// null, // 鏉＄爜
+// null, // 浜у湴
+// null, // 鍘傚
+// null, // 鐢熶骇鏃ユ湡
+// null, // 鍝侀」鏁�
+// null, // 瀹夊叏搴撳瓨閲�
+// null, // 閲嶉噺
+// null, // 闀垮害
+// null, // 浣撶Н
+// null, // 涓夋柟缂栫爜
+// null, // 渚涘簲鍟�
+// null, // 渚涘簲鍟嗙紪鐮�
+// null, // 鏄惁鎵规
+// null, // 淇濊川鏈�
+// null, // 棰勮澶╂暟
+// null, // 鍒惰喘
+// null, // 瑕佹眰妫�楠�
+// null, // 鍗遍櫓鍝�
+// null, // 鐘舵�乕闈炵┖]
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ 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 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 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 getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
+ 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 getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
deleted file mode 100644
index e6f8431..0000000
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ /dev/null
@@ -1,593 +0,0 @@
-package com.zy.asrs.entity;
-
-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.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("bas_mat_code")
-public class MatCode implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @TableId(value = "mat_no", type = IdType.INPUT)
- @TableField("mat_no")
- private String matNo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉″舰鐮�")
- private String barcode;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @TableField("mat_name")
- private String matName;
-
- /**
- * 鐗╂枡鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String str1;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String str2;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String str3;
-
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String str4;
-
- @ApiModelProperty(value= "鍨嬪彿")
- private String str5;
-
- @ApiModelProperty(value= "鎵瑰彿")
- private String str6;
-
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String str7;
-
- @ApiModelProperty(value= "")
- private String str8;
-
- @ApiModelProperty(value= "")
- private String str9;
-
- @ApiModelProperty(value= "")
- private String str10;
-
- @ApiModelProperty(value= "")
- private String str11;
-
- @ApiModelProperty(value= "")
- private String str12;
-
- @ApiModelProperty(value= "")
- private String str13;
-
- @ApiModelProperty(value= "")
- private String str14;
-
- @ApiModelProperty(value= "")
- private String str15;
-
- @ApiModelProperty(value= "")
- private String str16;
-
- @ApiModelProperty(value= "")
- private String str17;
-
- @ApiModelProperty(value= "")
- private String str18;
-
- @ApiModelProperty(value= "")
- private String str19;
-
- @ApiModelProperty(value= "")
- private String str20;
-
- @ApiModelProperty(value= "")
- private String str21;
-
- @ApiModelProperty(value= "")
- private String str22;
-
- @ApiModelProperty(value= "")
- private String str23;
-
- @ApiModelProperty(value= "閲嶉噺")
- private Double num1;
-
- @ApiModelProperty(value= "")
- private Double num2;
-
- @ApiModelProperty(value= "")
- private Double num3;
-
- @ApiModelProperty(value= "")
- private Double num4;
-
- @ApiModelProperty(value= "")
- private Double num5;
-
- @ApiModelProperty(value= "")
- private Double num6;
-
- @ApiModelProperty(value= "")
- private Date date1;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- @ApiModelProperty(value= "")
- private Short status;
-
- public MatCode() {}
-
- public MatCode(String barcode,String matName,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,String str11,String str12,String str13,String str14,String str15,String str16,String str17,String str18,String str19,String str20,String str21,String str22,String str23,Double num1,Double num2,Double num3,Double num4,Double num5,Double num6,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
- this.barcode = barcode;
- this.matName = matName;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- this.str4 = str4;
- this.str5 = str5;
- this.str6 = str6;
- this.str7 = str7;
- this.str8 = str8;
- this.str9 = str9;
- this.str10 = str10;
- this.str11 = str11;
- this.str12 = str12;
- this.str13 = str13;
- this.str14 = str14;
- this.str15 = str15;
- this.str16 = str16;
- this.str17 = str17;
- this.str18 = str18;
- this.str19 = str19;
- this.str20 = str20;
- this.str21 = str21;
- this.str22 = str22;
- this.str23 = str23;
- this.num1 = num1;
- this.num2 = num2;
- this.num3 = num3;
- this.num4 = num4;
- this.num5 = num5;
- this.num6 = num6;
- this.date1 = date1;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.status = status;
- }
-
-// MatCode matCode = new MatCode(
-// null, // 鏉＄爜
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鐗╂枡鍗曚綅
-// null, // 瑙勬牸
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null //
-// );
-
- public String getMatNo() {
- return matNo;
- }
-
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public String getMatName() {
- return matName;
- }
-
- public void setMatName(String matName) {
- this.matName = matName;
- }
-
- public String getStr1() {
- return str1;
- }
-
- public void setStr1(String str1) {
- this.str1 = str1;
- }
-
- public String getStr2() {
- return str2;
- }
-
- public void setStr2(String str2) {
- this.str2 = str2;
- }
-
- public String getStr3() {
- return str3;
- }
-
- public void setStr3(String str3) {
- this.str3 = str3;
- }
-
- public String getStr4() {
- return str4;
- }
-
- public void setStr4(String str4) {
- this.str4 = str4;
- }
-
- public String getStr5() {
- return str5;
- }
-
- public void setStr5(String str5) {
- this.str5 = str5;
- }
-
- public String getStr6() {
- return str6;
- }
-
- public void setStr6(String str6) {
- this.str6 = str6;
- }
-
- public String getStr7() {
- return str7;
- }
-
- public void setStr7(String str7) {
- this.str7 = str7;
- }
-
- public String getStr8() {
- return str8;
- }
-
- public void setStr8(String str8) {
- this.str8 = str8;
- }
-
- public String getStr9() {
- return str9;
- }
-
- public void setStr9(String str9) {
- this.str9 = str9;
- }
-
- public String getStr10() {
- return str10;
- }
-
- public void setStr10(String str10) {
- this.str10 = str10;
- }
-
- public String getStr11() {
- return str11;
- }
-
- public void setStr11(String str11) {
- this.str11 = str11;
- }
-
- public String getStr12() {
- return str12;
- }
-
- public void setStr12(String str12) {
- this.str12 = str12;
- }
-
- public String getStr13() {
- return str13;
- }
-
- public void setStr13(String str13) {
- this.str13 = str13;
- }
-
- public String getStr14() {
- return str14;
- }
-
- public void setStr14(String str14) {
- this.str14 = str14;
- }
-
- public String getStr15() {
- return str15;
- }
-
- public void setStr15(String str15) {
- this.str15 = str15;
- }
-
- public String getStr16() {
- return str16;
- }
-
- public void setStr16(String str16) {
- this.str16 = str16;
- }
-
- public String getStr17() {
- return str17;
- }
-
- public void setStr17(String str17) {
- this.str17 = str17;
- }
-
- public String getStr18() {
- return str18;
- }
-
- public void setStr18(String str18) {
- this.str18 = str18;
- }
-
- public String getStr19() {
- return str19;
- }
-
- public void setStr19(String str19) {
- this.str19 = str19;
- }
-
- public String getStr20() {
- return str20;
- }
-
- public void setStr20(String str20) {
- this.str20 = str20;
- }
-
- public String getStr21() {
- return str21;
- }
-
- public void setStr21(String str21) {
- this.str21 = str21;
- }
-
- public String getStr22() {
- return str22;
- }
-
- public void setStr22(String str22) {
- this.str22 = str22;
- }
-
- public String getStr23() {
- return str23;
- }
-
- public void setStr23(String str23) {
- this.str23 = str23;
- }
-
- public Double getNum1() {
- return num1;
- }
-
- public void setNum1(Double num1) {
- this.num1 = num1;
- }
-
- public Double getNum2() {
- return num2;
- }
-
- public void setNum2(Double num2) {
- this.num2 = num2;
- }
-
- public Double getNum3() {
- return num3;
- }
-
- public void setNum3(Double num3) {
- this.num3 = num3;
- }
-
- public Double getNum4() {
- return num4;
- }
-
- public void setNum4(Double num4) {
- this.num4 = num4;
- }
-
- public Double getNum5() {
- return num5;
- }
-
- public void setNum5(Double num5) {
- this.num5 = num5;
- }
-
- public Double getNum6() {
- return num6;
- }
-
- public void setNum6(Double num6) {
- this.num6 = num6;
- }
-
- public Date getDate1() {
- return date1;
- }
-
- public String getDate1$(){
- if (Cools.isEmpty(this.date1)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.date1);
- }
-
- public void setDate1(Date date1) {
- this.date1 = date1;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- 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)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return 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 Short getStatus() {
- return status;
- }
-
- public void setStatus(Short status) {
- this.status = status;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index a18b5bf..78185ae 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
+import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,82 +17,114 @@
private static final long serialVersionUID = 1L;
- /**
- * 鐗╂枡
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String type;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String color;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String supplier;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String warehouse;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String brand;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String altme;
-
- /**
- * 鎵樼洏鏉＄爜
- */
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
- /**
- * 鐢ㄦ埛ID
- */
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String bname;
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
@ApiModelProperty(value= "搴撲綅鍙�")
@TableField("loc_no")
- private Date locNo;
+ private String locNo;
+
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ @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;
+
+ @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= "闀垮害")
+ private Double length;
+
+ @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;
+
+ @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;
+
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
@ApiModelProperty(value= "鐘舵��")
private String status;
@@ -100,39 +133,74 @@
@TableField("io_status")
private String ioStatus;
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼鏃堕棿
- */
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- /**
- * 淇敼浜哄憳
- */
@ApiModelProperty(value= "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
- /**
- * 娣诲姞鏃堕棿
- */
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- /**
- * 鍒涘缓鑰�
- */
@ApiModelProperty(value= "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
+
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ 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 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 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 getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
@@ -148,4 +216,7 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(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 37c368d..39ea4d5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -1,24 +1,20 @@
package com.zy.asrs.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
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.AllArgsConstructor;
import lombok.Data;
-import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@Data
-@NoArgsConstructor
-@AllArgsConstructor
@TableName("asr_wrk_detl")
public class WrkDetl implements Serializable {
@@ -38,59 +34,11 @@
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "浜у搧缂栫爜")
- @TableId(value = "mat_no")
- @TableField("mat_no")
- private String matNo;
-
- @ApiModelProperty(value= "浜у搧鍚嶇О")
- @TableId(value = "mat_name")
- @TableField("mat_name")
- private String matName;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- @ApiModelProperty(value= "灏哄")
- private String size;
-
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- @ApiModelProperty(value= "鍗曢噸")
- private Double weight;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("bill_no")
- private String billNo;
-
- /**
- * 搴忓彿
- */
- @ApiModelProperty(value= "搴忓彿")
- @TableField("seq_no")
- private Integer seqNo;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
/**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Double qty;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ private Double anfme;
/**
* 鎵樼洏鏉＄爜
@@ -99,16 +47,193 @@
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= "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @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;
/**
* 淇敼浜哄憳
@@ -138,21 +263,67 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableField(exist = false)
- private String locNo;
-
- @TableField("Item_batch")
- private String itemBatch;
-
- @TableField("order_no")
- private String orderNo;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.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 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 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 getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
}
public String getModiUser$(){
@@ -187,4 +358,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java b/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
deleted file mode 100644
index a09bd26..0000000
--- a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.MatCode;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface MatCodeMapper extends BaseMapper<MatCode> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
new file mode 100644
index 0000000..aa58928
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.Mat;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface MatMapper extends BaseMapper<Mat> {
+
+ Mat selectByMatnr(@Param("matnr")String matnr);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/MatCodeService.java b/src/main/java/com/zy/asrs/service/MatCodeService.java
deleted file mode 100644
index 0f78ed5..0000000
--- a/src/main/java/com/zy/asrs/service/MatCodeService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.MatCode;
-
-public interface MatCodeService extends IService<MatCode> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
new file mode 100644
index 0000000..f36a51e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Mat;
+
+public interface MatService extends IService<Mat> {
+
+ Mat selectByMatnr(String matnr);
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index fb33d8d..f0ad4e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1409,7 +1409,7 @@
ledCommand.setStaNo(wrkMast.getStaNo());
if (wrkMast.getIoType() != 110) {
List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatNo(), wrkDetl.getMatName(), wrkDetl.getQty())));
+ wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme())));
}
commands.add(ledCommand);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
deleted file mode 100644
index 72ae4e0..0000000
--- a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.mapper.MatCodeMapper;
-import com.zy.asrs.service.MatCodeService;
-import org.springframework.stereotype.Service;
-
-@Service("matCodeService")
-public class MatCodeServiceImpl extends ServiceImpl<MatCodeMapper, MatCode> implements MatCodeService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
new file mode 100644
index 0000000..f3ef3cc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.mapper.MatMapper;
+import com.zy.asrs.service.MatService;
+import org.springframework.stereotype.Service;
+
+@Service("matService")
+public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
+
+ @Override
+ public Mat selectByMatnr(String matnr) {
+ return this.baseMapper.selectByMatnr(matnr);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 61db131..78bf034 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.mapper.WrkDetlMapper;
-import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +20,7 @@
public class WrkDetlServiceImpl extends ServiceImpl<WrkDetlMapper, WrkDetl> implements WrkDetlService {
@Autowired
- private MatCodeService matCodeService;
+ private MatService matService;
@Override
@Transactional
@@ -30,15 +29,15 @@
return;
}
for (WaitPakin waitPakin : waitPakins) {
- MatCode matCode = matCodeService.selectById(waitPakin.getMatnr());
- if (Cools.isEmpty(matCode)){
+ Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
+ if (Cools.isEmpty(mat)){
throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
}
// 淇濇寔宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+ wrkDetl.sync(mat);
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiTime(new Date());
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index bb6afba..3fdb5da 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,10 +1,6 @@
package com.zy.asrs.utils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WrkDetl;
import com.zy.common.model.LocTypeDto;
/**
@@ -14,53 +10,6 @@
// 涓氬姟 ----------------------------------------------------------------------
- public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
-// wrkDetl.setMatNo(matCode.getMatNo()); // 鐗╂枡缂栧彿
-// wrkDetl.setMatName(matCode.getMatName()); // 鐗╂枡鎻忚堪
-// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
-// wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
-// wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
-// wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
-// wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
-// wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-// wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
- }
-
- public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
- wrkDetl.setMatNo(locDetl.getMatNo()); // 浜у搧缂栧彿
- wrkDetl.setMatName(locDetl.getMatName()); // 浜у搧鎻忚堪
- wrkDetl.setSpecs(locDetl.getSpecs()); // 瑙勬牸
- wrkDetl.setUnit(locDetl.getUnit()); // 鍗曚綅
- wrkDetl.setSize(locDetl.getSize()); // 灏哄
- wrkDetl.setColor(locDetl.getColor()); // 棰滆壊
- wrkDetl.setWeight(locDetl.getWeight()); // 鍗曢噸
- wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
- }
-
- public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
-// locDetl.setMatNo(matCode.getMatNo()); // 鐗╂枡缂栧彿
-// locDetl.setMatName(matCode.getMatName()); // 鐗╂枡鎻忚堪
-// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// locDetl.setType(matCode.getStr5()); // 鍨嬪彿
-// locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
-// locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
-// locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
-// locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
-// locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-// locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
- }
-
- public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
- locDetl.setMatNo(wrkDetl.getMatNo()); // 浜у搧缂栧彿
- locDetl.setMatName(wrkDetl.getMatName()); // 浜у搧鎻忚堪
- locDetl.setSpecs(wrkDetl.getSpecs()); // 瑙勬牸
- locDetl.setUnit(wrkDetl.getUnit()); // 鍗曚綅
- locDetl.setSize(wrkDetl.getSize()); // 灏哄
- locDetl.setColor(wrkDetl.getColor()); // 棰滆壊
- locDetl.setQty(wrkDetl.getQty()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- }
/**
* 搴撲綅绉昏浆鏃剁被鍨嬫娴�
diff --git a/src/main/java/com/zy/common/utils/Synchro.java b/src/main/java/com/zy/common/utils/Synchro.java
new file mode 100644
index 0000000..c23fbf1
--- /dev/null
+++ b/src/main/java/com/zy/common/utils/Synchro.java
@@ -0,0 +1,38 @@
+package com.zy.common.utils;
+
+import com.core.exception.CoolException;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * Created by vincent on 2022/4/1
+ */
+public class Synchro {
+
+ public static void Copy(Object source, Object dest) {
+ try {
+ BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class);
+ PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
+ BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
+ PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
+ for (PropertyDescriptor propertyDescriptor : sourceProperty) {
+ for (PropertyDescriptor descriptor : destProperty) {
+ if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
+ Method readMethod = propertyDescriptor.getReadMethod();
+ Method writeMethod = descriptor.getWriteMethod();
+ if (null != writeMethod && null != readMethod) {
+ writeMethod.invoke(dest, readMethod.invoke(source));
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
+ }
+ }
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7072b4d..9cad56b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=ynwcs
+ url: jdbc:sqlserver://localhost:1433;databasename=ynasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d66d35c..230ec77 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -5,44 +5,50 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
<result column="loc_no" property="locNo" />
- <result column="mat_no" property="matNo" />
- <result column="mat_name" property="matName" />
- <result column="specs" property="specs" />
- <result column="size" property="size" />
- <result column="color" property="color" />
- <result column="weight" property="weight" />
- <result column="supplier" property="supplier" />
- <result column="warehouse" property="warehouse" />
- <result column="brand" property="brand" />
- <result column="qty" property="qty" />
- <result column="unit" property="unit" />
<result column="zpallet" property="zpallet" />
- <result column="bname" property="bname" />
- <result column="memo" property="memo" />
+ <result column="anfme" property="anfme" />
+ <result column="matnr" property="matnr" />
+ <result column="maktx" property="maktx" />
+ <result column="batch" property="batch" />
+ <result column="order_no" property="orderNo" />
+
+ <result column="specs" property="specs" />
+ <result column="model" property="model" />
+ <result column="color" property="color" />
+ <result column="brand" property="brand" />
+ <result column="unit" property="unit" />
+ <result column="price" property="price" />
+ <result column="sku" property="sku" />
+ <result column="units" property="units" />
+ <result column="barcode" property="barcode" />
+ <result column="origin" property="origin" />
+ <result column="manu" property="manu" />
+ <result column="manu_date" property="manuDate" />
+ <result column="item_num" property="itemNum" />
+ <result column="safe_qty" property="safeQty" />
+ <result column="weight" property="weight" />
+ <result column="length" property="length" />
+ <result column="volume" property="volume" />
+ <result column="three_code" property="threeCode" />
+ <result column="supp" property="supp" />
+ <result column="supp_code" property="suppCode" />
+ <result column="be_batch" property="beBatch" />
+ <result column="dead_time" property="deadTime" />
+ <result column="dead_warn" property="deadWarn" />
+ <result column="source" property="source" />
+ <result column="inspect" property="inspect" />
+ <result column="danger" property="danger" />
+
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
+ <result column="memo" property="memo" />
</resultMap>
<sql id="stockOutCondition">
<if test="loc_no!=null and loc_no!='' ">
and a.loc_no like '%' + #{loc_no} + '%'
- </if>
- <if test="matNo!=null and matNo!='' ">
- and a.mat_no like '%' + #{matNo} + '%'
- </if>
- <if test="matName!=null and matName!='' ">
- and a.mat_name like '%' + #{matName} + '%'
- </if>
- <if test="anfme!=null and anfme!='' ">
- and a.anfme like '%' + #{anfme} + '%'
- </if>
- <if test="altme!=null and altme!='' ">
- and a.altme like '%' + #{altme} + '%'
- </if>
- <if test="startTime!=null and endTime!=null">
- and a.modi_time between #{startTime} and #{endTime}
</if>
</sql>
diff --git a/src/main/resources/mapper/MatCodeMapper.xml b/src/main/resources/mapper/MatCodeMapper.xml
deleted file mode 100644
index 8e78b20..0000000
--- a/src/main/resources/mapper/MatCodeMapper.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.MatCodeMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.MatCode">
- <result column="mat_no" property="matNo" />
- <result column="barcode" property="barcode" />
- <result column="mat_name" property="matName" />
- <result column="str1" property="str1" />
- <result column="str2" property="str2" />
- <result column="str3" property="str3" />
- <result column="str4" property="str4" />
- <result column="str5" property="str5" />
- <result column="str6" property="str6" />
- <result column="str7" property="str7" />
- <result column="str8" property="str8" />
- <result column="str9" property="str9" />
- <result column="str10" property="str10" />
- <result column="str11" property="str11" />
- <result column="str12" property="str12" />
- <result column="str13" property="str13" />
- <result column="str14" property="str14" />
- <result column="str15" property="str15" />
- <result column="str16" property="str16" />
- <result column="str17" property="str17" />
- <result column="str18" property="str18" />
- <result column="str19" property="str19" />
- <result column="str20" property="str20" />
- <result column="str21" property="str21" />
- <result column="str22" property="str22" />
- <result column="str23" property="str23" />
- <result column="num1" property="num1" />
- <result column="num2" property="num2" />
- <result column="num3" property="num3" />
- <result column="num4" property="num4" />
- <result column="num5" property="num5" />
- <result column="num6" property="num6" />
- <result column="date1" property="date1" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="status" property="status" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
new file mode 100644
index 0000000..de34655
--- /dev/null
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.MatMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Mat">
+ <id column="id" property="id" />
+ <result column="uuid" property="uuid" />
+ <result column="tag_id" property="tagId" />
+ <result column="matnr" property="matnr" />
+ <result column="maktx" property="maktx" />
+ <result column="name" property="name" />
+ <result column="specs" property="specs" />
+ <result column="model" property="model" />
+ <result column="color" property="color" />
+ <result column="brand" property="brand" />
+ <result column="unit" property="unit" />
+ <result column="price" property="price" />
+ <result column="sku" property="sku" />
+ <result column="units" property="units" />
+ <result column="barcode" property="barcode" />
+ <result column="origin" property="origin" />
+ <result column="manu" property="manu" />
+ <result column="manu_date" property="manuDate" />
+ <result column="item_num" property="itemNum" />
+ <result column="safe_qty" property="safeQty" />
+ <result column="weight" property="weight" />
+ <result column="length" property="length" />
+ <result column="volume" property="volume" />
+ <result column="three_code" property="threeCode" />
+ <result column="supp" property="supp" />
+ <result column="supp_code" property="suppCode" />
+ <result column="be_batch" property="beBatch" />
+ <result column="dead_time" property="deadTime" />
+ <result column="dead_warn" property="deadWarn" />
+ <result column="source" property="source" />
+ <result column="inspect" property="inspect" />
+ <result column="danger" property="danger" />
+ <result column="status" property="status" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+
+ <result column="stock" property="stock" />
+ </resultMap>
+
+ <select id="selectByMatnr" resultMap="BaseResultMap">
+ select top 1 * from man_mat where 1=1 and matnr = #{matnr}
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index 4615185..e4227b7 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -4,27 +4,49 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
+ <result column="zpallet" property="zpallet" />
+ <result column="loc_no" property="locNo" />
+ <result column="anfme" property="anfme" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
- <result column="lgnum" property="lgnum" />
- <result column="type" property="type" />
+ <result column="batch" property="batch" />
+ <result column="order_no" property="orderNo" />
+
+ <result column="specs" property="specs" />
+ <result column="model" property="model" />
<result column="color" property="color" />
- <result column="supplier" property="supplier" />
- <result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
- <result column="anfme" property="anfme" />
- <result column="altme" property="altme" />
- <result column="zpallet" property="zpallet" />
- <result column="bname" property="bname" />
- <result column="loc_no" property="locNo" />
+ <result column="unit" property="unit" />
+ <result column="price" property="price" />
+ <result column="sku" property="sku" />
+ <result column="units" property="units" />
+ <result column="barcode" property="barcode" />
+ <result column="origin" property="origin" />
+ <result column="manu" property="manu" />
+ <result column="manu_date" property="manuDate" />
+ <result column="item_num" property="itemNum" />
+ <result column="safe_qty" property="safeQty" />
+ <result column="weight" property="weight" />
+ <result column="length" property="length" />
+ <result column="volume" property="volume" />
+ <result column="three_code" property="threeCode" />
+ <result column="supp" property="supp" />
+ <result column="supp_code" property="suppCode" />
+ <result column="be_batch" property="beBatch" />
+ <result column="dead_time" property="deadTime" />
+ <result column="dead_warn" property="deadWarn" />
+ <result column="source" property="source" />
+ <result column="inspect" property="inspect" />
+ <result column="danger" property="danger" />
+
<result column="status" property="status" />
<result column="io_status" property="ioStatus" />
- <result column="memo" property="memo" />
+
<result column="modi_time" property="modiTime" />
<result column="modi_user" property="modiUser" />
<result column="appe_time" property="appeTime" />
<result column="appe_user" property="appeUser" />
-
+ <result column="memo" property="memo" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 160290a..5f5fa79 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -6,28 +6,49 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetl">
<result column="wrk_no" property="wrkNo" />
<result column="io_time" property="ioTime" />
- <result column="mat_no" property="matNo" />
- <result column="mat_name" property="matName" />
- <result column="specs" property="specs" />
- <result column="size" property="size" />
- <result column="color" property="color" />
- <result column="weight" property="weight" />
- <result column="bill_no" property="billNo" />
- <result column="seq_no" property="seqNo" />
- <result column="brand" property="brand" />
- <result column="qty" property="qty" />
- <result column="unit" property="unit" />
+ <result column="anfme" property="anfme" />
<result column="zpallet" property="zpallet" />
- <result column="bname" property="bname" />
- <result column="memo" property="memo" />
+ <result column="matnr" property="matnr" />
+ <result column="maktx" property="maktx" />
+ <result column="batch" property="batch" />
+ <result column="order_no" property="orderNo" />
+
+ <result column="specs" property="specs" />
+ <result column="model" property="model" />
+ <result column="color" property="color" />
+ <result column="brand" property="brand" />
+ <result column="unit" property="unit" />
+ <result column="price" property="price" />
+ <result column="sku" property="sku" />
+ <result column="units" property="units" />
+ <result column="barcode" property="barcode" />
+ <result column="origin" property="origin" />
+ <result column="manu" property="manu" />
+ <result column="manu_date" property="manuDate" />
+ <result column="item_num" property="itemNum" />
+ <result column="safe_qty" property="safeQty" />
+ <result column="weight" property="weight" />
+ <result column="length" property="length" />
+ <result column="volume" property="volume" />
+ <result column="three_code" property="threeCode" />
+ <result column="supp" property="supp" />
+ <result column="supp_code" property="suppCode" />
+ <result column="be_batch" property="beBatch" />
+ <result column="dead_time" property="deadTime" />
+ <result column="dead_warn" property="deadWarn" />
+ <result column="source" property="source" />
+ <result column="inspect" property="inspect" />
+ <result column="danger" property="danger" />
+
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
+ <result column="memo" property="memo" />
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
- select wrk_no, mat_no, mat_name, qty from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
+ select wrk_no, matnr, maktx, qty from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
</select>
</mapper>
--
Gitblit v1.9.1