From cd8ab30f720cd8ab32062024b00c7fe3294a56a4 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 27 五月 2024 16:28:23 +0800 Subject: [PATCH] ERP接口 --- src/main/java/com/zy/asrs/entity/LocDetl.java | 49 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index bd7eab3..1ee80a7 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -7,6 +7,7 @@ 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; @@ -27,23 +28,23 @@ @TableField("loc_no") private String locNo; - @ApiModelProperty(value= "鎵樼洏鏉$爜") + @ApiModelProperty(value= "璐ф灦鏉$爜") private String zpallet; @ApiModelProperty(value= "鏁伴噺") @ExcelProperty("鏁伴噺") private Double anfme; - @ApiModelProperty(value= "鍟嗗搧缂栧彿") - @ExcelProperty("鍟嗗搧缂栧彿") + @ApiModelProperty(value= "鐗╂枡鍙�") + @ExcelProperty("鐗╂枡鍙�") private String matnr; - @ApiModelProperty(value= "鍟嗗搧鍚嶇О") - @ExcelProperty("鍟嗗搧鍚嶇О") + @ApiModelProperty(value= "鐗╂枡鍚嶇О") + @ExcelProperty("鐗╂枡鍚嶇О") private String maktx; - @ApiModelProperty(value= "鎵瑰彿") - @ExcelProperty("鎵瑰彿") + @ApiModelProperty(value= "搴忓垪鐮�") + @ExcelProperty("搴忓垪鐮�") private String batch; @ApiModelProperty(value= "鍗曟嵁缂栧彿") @@ -54,7 +55,7 @@ @ApiModelProperty(value= "瑙勬牸") private String specs; - @ApiModelProperty(value= "鍨嬪彿") + @ApiModelProperty(value= "鎵规") private String model; @ApiModelProperty(value= "棰滆壊") @@ -72,19 +73,19 @@ @ApiModelProperty(value= "sku") private String sku; - @ApiModelProperty(value= "鍗曚綅閲�") + @ApiModelProperty(value= "鍖呮暟") private Double units; @ApiModelProperty(value= "鏉$爜") private String barcode; - @ApiModelProperty(value= "浜у湴") + @ApiModelProperty(value= "鐗╂枡鐘舵��") private String origin; @ApiModelProperty(value= "鍘傚") private String manu; - @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @ApiModelProperty(value= "鍗曟嵁鏃堕棿") @TableField("manu_date") private String manuDate; @@ -132,7 +133,7 @@ private Integer source; @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") - private Integer check; + private Integer inspect; @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") private Integer danger; @@ -155,6 +156,10 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + + @TableField("stock_freeze") + @ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝e父,0:鍐荤粨}") + private Integer stockFreeze; public String getLocNo$(){ LocMastService service = SpringUtils.getBean(LocMastService.class); @@ -191,15 +196,15 @@ } } - public String getCheck$(){ - if (null == this.check){ return null; } - switch (this.check){ + public String getInspect$(){ + if (null == this.inspect){ return null; } + switch (this.inspect){ case 1: return "鏄�"; case 0: return "鍚�"; default: - return String.valueOf(this.check); + return String.valueOf(this.inspect); } } @@ -231,7 +236,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); @@ -248,4 +252,15 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } + public void sync(Object source) { + Synchro.Copy(source, this); + } + + public String getStockFreeze$() { + if (Cools.isEmpty(this.stockFreeze)){ + return ""; + } + return this.stockFreeze == 1 ? "姝e父" : "鍐荤粨"; + } + } -- Gitblit v1.9.1