From 09c46e67c54d9ea538e2041565f57e995c60ccb8 Mon Sep 17 00:00:00 2001 From: Administrator <pjb> Date: 星期日, 25 五月 2025 12:58:52 +0800 Subject: [PATCH] 外置输送线修改 --- src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 90 +++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java index da098cd..ea41e59 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java @@ -22,209 +22,211 @@ /** * 宸ヤ綔鍙� */ - @ApiModelProperty(value= "宸ヤ綔鍙�") + @ApiModelProperty(value = "宸ヤ綔鍙�") @TableField("wrk_no") private Integer wrkNo; /** * 宸ヤ綔鏃堕棿 */ - @ApiModelProperty(value= "宸ヤ綔鏃堕棿") + @ApiModelProperty(value = "宸ヤ綔鏃堕棿") @TableField("io_time") private Date ioTime; /** * 鏁伴噺 */ - @ApiModelProperty(value= "鏁伴噺") + @ApiModelProperty(value = "鏁伴噺") private Double anfme; /** * 鎵樼洏鏉$爜 */ - @ApiModelProperty(value= "鎵樼洏鏉$爜") + @ApiModelProperty(value = "鎵樼洏鏉$爜") private String zpallet; /** * 鐗╂枡 */ - @ApiModelProperty(value= "鍟嗗搧缂栧彿") + @ApiModelProperty(value = "鍟嗗搧缂栧彿") private String matnr; /** * 鐗╂枡鎻忚堪 */ - @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + @ApiModelProperty(value = "鍟嗗搧鍚嶇О") private String maktx; /** * 鎵瑰彿 */ - @ApiModelProperty(value= "鎵瑰彿") + @ApiModelProperty(value = "鎵瑰彿") private String batch; /** * 鍗曟嵁缂栧彿 */ - @ApiModelProperty(value= "鍗曟嵁缂栧彿") + @ApiModelProperty(value = "鍗曟嵁缂栧彿") @TableField("order_no") private String orderNo; /** * 瑙勬牸 */ - @ApiModelProperty(value= "瑙勬牸") + @ApiModelProperty(value = "瑙勬牸") private String specs; /** * 鍨嬪彿 */ - @ApiModelProperty(value= "鍨嬪彿") + @ApiModelProperty(value = "鍨嬪彿") private String model; /** * 棰滆壊 */ - @ApiModelProperty(value= "棰滆壊") + @ApiModelProperty(value = "棰滆壊") private String color; /** * 鍝佺墝 */ - @ApiModelProperty(value= "鍝佺墝") + @ApiModelProperty(value = "鍝佺墝") private String brand; /** * 鍗曚綅 */ - @ApiModelProperty(value= "鍗曚綅") + @ApiModelProperty(value = "鍗曚綅") private String unit; /** * 鍗曚环 */ - @ApiModelProperty(value= "鍗曚环") + @ApiModelProperty(value = "鍗曚环") private Double price; /** * sku */ - @ApiModelProperty(value= "sku") + @ApiModelProperty(value = "sku") private String sku; /** * 鍗曚綅閲� */ - @ApiModelProperty(value= "鍗曚綅閲�") + @ApiModelProperty(value = "鍗曚綅閲�") private Double units; /** * 鏉$爜 */ - @ApiModelProperty(value= "鏉$爜") + @ApiModelProperty(value = "鏉$爜") private String barcode; /** * 浜у湴 */ - @ApiModelProperty(value= "浜у湴") + @ApiModelProperty(value = "浜у湴") private String origin; /** * 瀹夊叏搴撳瓨閲� */ - @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�") + @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�") @TableField("safe_qty") private Double safeQty; /** * 閲嶉噺 */ - @ApiModelProperty(value= "閲嶉噺") + @ApiModelProperty(value = "閲嶉噺") private Double weight; /** * 闀垮害 */ - @ApiModelProperty(value= "闀垮害") + @ApiModelProperty(value = "闀垮害") private Double length; /** * 浣撶Н */ - @ApiModelProperty(value= "浣撶Н") + @ApiModelProperty(value = "浣撶Н") private Double volume; /** * 涓夋柟缂栫爜 */ - @ApiModelProperty(value= "涓夋柟缂栫爜") + @ApiModelProperty(value = "涓夋柟缂栫爜") @TableField("three_code") private String threeCode; /** * 渚涘簲鍟� */ - @ApiModelProperty(value= "渚涘簲鍟�") + @ApiModelProperty(value = "渚涘簲鍟�") private String supp; /** * 渚涘簲鍟嗙紪鐮� */ - @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�") + @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�") @TableField("supp_code") private String suppCode; /** * 鍗遍櫓鍝� 1: 鏄� 0: 鍚� */ - @ApiModelProperty(value= "鍗遍櫓鍝� 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= "澶囨敞") + @ApiModelProperty(value = "澶囨敞") private String memo; - public String getIoTime$(){ - if (Cools.isEmpty(this.ioTime)){ + public String getIoTime$() { + if (Cools.isEmpty(this.ioTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); } - public String getDanger$(){ - if (null == this.danger){ return null; } - switch (this.danger){ + public String getDanger$() { + if (null == this.danger) { + return null; + } + switch (this.danger) { case 1: return "鏄�"; case 0: @@ -234,33 +236,33 @@ } } - 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 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 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 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); -- Gitblit v1.9.1