From 64126dfd00ed90af484fbf7b173e00fcebc4f9fa Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 24 五月 2023 15:56:11 +0800 Subject: [PATCH] 入库通知档和历史档增加mat_type物料类型,组托增加mat_type --- src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 23 +++++++++++++++++++++++ src/main/java/com/zy/asrs/entity/WaitPakin.java | 23 +++++++++++++++++++++++ src/main/webapp/static/js/waitPakin/waitPakin.js | 1 + src/main/resources/mapper/WaitPakinMapper.xml | 1 + src/main/resources/mapper/WaitPakinLogMapper.xml | 1 + src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 +++ src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 1 + 7 files changed, 53 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index 6037263..b737c10 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -155,6 +155,13 @@ @ApiModelProperty(value= "鏄惁鍐荤粨") private Integer frozen; + /** + * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁} + */ + @ApiModelProperty(value= "鐗╂枡绫诲瀷") + @TableField("mat_type") + private Integer matType; + public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ @@ -222,4 +229,20 @@ public void sync(Object source) { Synchro.Copy(source, this); } + + public String getMatType$() { + if (this.matType == null) { + return ""; + } + switch (this.matType) { + case 1: + return "鍗曞搧"; + case 2: + return "楂橀"; + case 3: + return "娣锋斁"; + default: + return ""; + } + } } diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java index 34cade8..2128b5f 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java @@ -151,6 +151,13 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + /** + * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁} + */ + @ApiModelProperty(value= "鐗╂枡绫诲瀷") + @TableField("mat_type") + private Integer matType; + public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ @@ -215,4 +222,20 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } + public String getMatType$() { + if (this.matType == null) { + return ""; + } + switch (this.matType) { + case 1: + return "鍗曞搧"; + case 2: + return "楂橀"; + case 3: + return "娣锋斁"; + default: + return ""; + } + } + } diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 6a86e25..27f4418 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -149,6 +149,7 @@ waitPakin.setMemo(detlDto.getMemo()); waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨 waitPakin.setManu(detlDto.getCstmr()); + waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷 if (!waitPakinService.insert(waitPakin)) { throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } @@ -199,6 +200,7 @@ waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); + waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷 if (!waitPakinService.insert(waitPakin)) { throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } @@ -502,6 +504,7 @@ waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); + waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷 if (!waitPakinService.insert(waitPakin)) { throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } diff --git a/src/main/resources/mapper/WaitPakinLogMapper.xml b/src/main/resources/mapper/WaitPakinLogMapper.xml index 543ead5..16304f7 100644 --- a/src/main/resources/mapper/WaitPakinLogMapper.xml +++ b/src/main/resources/mapper/WaitPakinLogMapper.xml @@ -47,6 +47,7 @@ <result column="appe_time" property="appeTime" /> <result column="appe_user" property="appeUser" /> <result column="memo" property="memo" /> + <result column="mat_type" property="matType" /> </resultMap> </mapper> diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml index e4227b7..f7f2a54 100644 --- a/src/main/resources/mapper/WaitPakinMapper.xml +++ b/src/main/resources/mapper/WaitPakinMapper.xml @@ -47,6 +47,7 @@ <result column="appe_time" property="appeTime" /> <result column="appe_user" property="appeUser" /> <result column="memo" property="memo" /> + <result column="mat_type" property="matType" /> </resultMap> </mapper> diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js index 35600fd..6e0e930 100644 --- a/src/main/webapp/static/js/waitPakin/waitPakin.js +++ b/src/main/webapp/static/js/waitPakin/waitPakin.js @@ -2,6 +2,7 @@ function getCol() { var cols = [ {type: 'checkbox'} ]; cols.push.apply(cols, detlCols); + cols.push({field: 'matType$', align: 'center',title: '鐗╂枡绫诲瀷'}) cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝e父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'"; if(row.status === 'Y'){html += " checked ";} diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js index 018767f..8dcb1db 100644 --- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js +++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js @@ -3,6 +3,7 @@ var cols = [ ]; cols.push.apply(cols, detlCols); + cols.push({field: 'matType$', align: 'center',title: '鐗╂枡绫诲瀷'}) cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝e父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'"; if(row.status === 'Y'){html += " checked ";} -- Gitblit v1.9.1