From 44c5f7f1c1b9cccd131df7d4c9a33af979635ece Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期五, 01 四月 2022 10:24:48 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 238 ++++++++++++++++++++--- src/main/resources/mapper/WrkDetlMapper.xml | 38 ++ src/main/resources/mapper/WrkDetlLogMapper.xml | 38 ++ src/main/java/com/zy/asrs/entity/WrkDetl.java | 238 ++++++++++++++++++++--- src/main/webapp/static/js/common.js | 36 ++ 5 files changed, 489 insertions(+), 99 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java index ca72362..938969b 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetl.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java @@ -34,6 +34,18 @@ private Date ioTime; /** + * 鏁伴噺 + */ + @ApiModelProperty(value= "鏁伴噺") + private Double anfme; + + /** + * 鎵樼洏鏉$爜 + */ + @ApiModelProperty(value= "鎵樼洏鏉$爜") + private String zpallet; + + /** * 鐗╂枡 */ @ApiModelProperty(value= "鍟嗗搧缂栧彿") @@ -59,70 +71,168 @@ private String orderNo; /** - * 浠撳簱鍙� + * 瑙勬牸 */ @ApiModelProperty(value= "瑙勬牸") - private String lgnum; + private String specs; /** - * 浠撳簱鍙� + * 鍨嬪彿 */ @ApiModelProperty(value= "鍨嬪彿") - private String type; + private String model; /** - * 鏉$爜 + * 棰滆壊 */ - @ApiModelProperty(value= "鏉$爜") + @ApiModelProperty(value= "棰滆壊") private String color; /** - * 鎵瑰彿 + * 鍝佺墝 */ - @ApiModelProperty(value= "鎵瑰彿") - private String supplier; - - /** - * 鍗曟嵁缂栧彿 - */ - @ApiModelProperty(value= "鍗曟嵁缂栧彿") - private String warehouse; - - /** - * 鍝侀」鏁� - */ - @ApiModelProperty(value= "鍝侀」鏁�") + @ApiModelProperty(value= "鍝佺墝") private String brand; - - /** - * 鏁伴噺 - */ - @ApiModelProperty(value= "鏁伴噺") - private Double anfme; /** * 鍗曚綅 */ @ApiModelProperty(value= "鍗曚綅") - private String altme; + private String unit; /** - * 鎵樼洏鏉$爜 + * 鍗曚环 */ - @ApiModelProperty(value= "鎵樼洏鏉$爜") - private String zpallet; + @ApiModelProperty(value= "鍗曚环") + private Double price; /** - * 瀹㈡埛鍚嶇О + * sku */ - @ApiModelProperty(value= "瀹㈡埛鍚嶇О") - private String bname; + @ApiModelProperty(value= "sku") + private String sku; /** - * 澶囨敞 + * 鍗曚綅閲� */ - @ApiModelProperty(value= "澶囨敞") - private String memo; + @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 check; + + /** + * 鍗遍櫓鍝� 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") + private Integer danger; /** * 淇敼浜哄憳 @@ -152,6 +262,12 @@ @TableField("appe_time") private Date appeTime; + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + public String getIoTime$(){ if (Cools.isEmpty(this.ioTime)){ return ""; @@ -159,6 +275,56 @@ 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 getCheck$(){ + if (null == this.check){ return null; } + switch (this.check){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.check); + } + } + + 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$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.modiUser); diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java index 8db6c7c..fe18307 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java @@ -34,6 +34,18 @@ private Date ioTime; /** + * 鏁伴噺 + */ + @ApiModelProperty(value= "鏁伴噺") + private Double anfme; + + /** + * 鎵樼洏鏉$爜 + */ + @ApiModelProperty(value= "鎵樼洏鏉$爜") + private String zpallet; + + /** * 鐗╂枡 */ @ApiModelProperty(value= "鍟嗗搧缂栧彿") @@ -58,72 +70,169 @@ @TableField("order_no") private String orderNo; - /** - * 浠撳簱鍙� + * 瑙勬牸 */ @ApiModelProperty(value= "瑙勬牸") - private String lgnum; + private String specs; /** - * 浠撳簱鍙� + * 鍨嬪彿 */ @ApiModelProperty(value= "鍨嬪彿") - private String type; + private String model; /** - * 浠撳簱鍙� + * 棰滆壊 */ - @ApiModelProperty(value= "鏉$爜") + @ApiModelProperty(value= "棰滆壊") private String color; /** - * 浠撳簱鍙� + * 鍝佺墝 */ - @ApiModelProperty(value= "鎵瑰彿") - private String supplier; - - /** - * 浠撳簱鍙� - */ - @ApiModelProperty(value= "鍗曟嵁缂栧彿") - private String warehouse; - - /** - * 浠撳簱鍙� - */ - @ApiModelProperty(value= "鍝侀」鏁�") + @ApiModelProperty(value= "鍝佺墝") private String brand; - - /** - * 鏁伴噺 - */ - @ApiModelProperty(value= "鏁伴噺") - private Double anfme; /** * 鍗曚綅 */ @ApiModelProperty(value= "鍗曚綅") - private String altme; + private String unit; /** - * 鎵樼洏鏉$爜 + * 鍗曚环 */ - @ApiModelProperty(value= "鎵樼洏鏉$爜") - private String zpallet; + @ApiModelProperty(value= "鍗曚环") + private Double price; /** - * 鐢ㄦ埛ID + * sku */ - @ApiModelProperty(value= "瀹㈡埛鍚嶇О") - private String bname; + @ApiModelProperty(value= "sku") + private String sku; /** - * 澶囨敞 + * 鍗曚綅閲� */ - @ApiModelProperty(value= "澶囨敞") - private String memo; + @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 check; + + /** + * 鍗遍櫓鍝� 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") + private Integer danger; /** * 淇敼浜哄憳 @@ -153,6 +262,11 @@ @TableField("appe_time") private Date appeTime; + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; public String getIoTime$(){ if (Cools.isEmpty(this.ioTime)){ @@ -161,6 +275,56 @@ 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 getCheck$(){ + if (null == this.check){ return null; } + switch (this.check){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.check); + } + } + + 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$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.modiUser); diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml index 0914d9a..f177631 100644 --- a/src/main/resources/mapper/WrkDetlLogMapper.xml +++ b/src/main/resources/mapper/WrkDetlLogMapper.xml @@ -6,25 +6,45 @@ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetlLog"> <result column="wrk_no" property="wrkNo" /> <result column="io_time" property="ioTime" /> + <result column="anfme" property="anfme" /> + <result column="zpallet" property="zpallet" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="batch" property="batch" /> <result column="order_no" property="orderNo" /> - <result column="lgnum" property="lgnum" /> - <result column="type" property="type" /> + + <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="memo" property="memo" /> + <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="check" property="check" /> + <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> </mapper> diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml index 90249c9..8e0e171 100644 --- a/src/main/resources/mapper/WrkDetlMapper.xml +++ b/src/main/resources/mapper/WrkDetlMapper.xml @@ -6,25 +6,45 @@ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetl"> <result column="wrk_no" property="wrkNo" /> <result column="io_time" property="ioTime" /> + <result column="anfme" property="anfme" /> + <result column="zpallet" property="zpallet" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="batch" property="batch" /> <result column="order_no" property="orderNo" /> - <result column="lgnum" property="lgnum" /> - <result column="type" property="type" /> + + <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="memo" property="memo" /> + <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="check" property="check" /> + <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="selectByWrkNo" resultMap="BaseResultMap"> diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index ce134ca..6eca232 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -213,16 +213,36 @@ var detlCols = [ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'} ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} + ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} ,{field: 'batch', align: 'center',title: '鎵瑰彿'} - ,{field: 'lgnum', align: 'center',title: '瑙勬牸'} - ,{field: 'type', align: 'center',title: '鍨嬪彿', hide: true} - ,{field: 'supplier', align: 'center',title: '鎵瑰彿', hide: true} ,{field: 'anfme', align: 'center',title: '鏁伴噺'} - ,{field: 'altme', align: 'center',title: '鍗曚綅'} - ,{field: 'color', align: 'center',title: '鏉$爜'} - ,{field: 'warehouse', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} - ,{field: 'brand', align: 'center',title: '鍝侀」鏁�', hide: true} ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'} - ,{field: 'bname', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true} + + ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true} + ,{field: 'color', align: 'center',title: '棰滆壊', hide: true} + ,{field: 'brand', align: 'center',title: '鍝佺墝'} + ,{field: 'unit', align: 'center',title: '鍗曚綅'} + ,{field: 'price', align: 'center',title: '鍗曚环', hide: true} + ,{field: 'sku', align: 'center',title: 'sku', hide: true} + ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true} + ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: true} + ,{field: 'origin', align: 'center',title: '浜у湴', hide: true} + ,{field: 'manu', align: 'center',title: '鍘傚', hide: true} + ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true} + ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true} + ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true} + ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true} + ,{field: 'length', align: 'center',title: '闀垮害', hide: true} + ,{field: 'volume', align: 'center',title: '浣撶Н', hide: true} + ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜', hide: true} + ,{field: 'supp', align: 'center',title: '渚涘簲鍟�'} + ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true} + ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true} + ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true} + ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true} + ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true} + ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true} + ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true} ] -- Gitblit v1.9.1