From a810d82e6ff0d820da6c888ebd9af0dba655d595 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 13:13:41 +0800
Subject: [PATCH] 入库通知档上架区域显示
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 22 +++++++++++
src/main/resources/mapper/WrkDetlLogMapper.xml | 1
src/main/webapp/static/js/pakStore/stockOut2.js | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +
src/main/java/com/zy/asrs/controller/WrkMastController.java | 1
src/main/resources/mapper/WrkDetlMapper.xml | 1
src/main/webapp/static/js/waitPakin/waitPakin.js | 1
src/main/java/com/zy/asrs/entity/LocDetl.java | 12 ++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/entity/Mat.java | 4 +-
src/main/java/com/zy/asrs/entity/WrkDetl.java | 23 +++++++++++
src/main/webapp/static/js/common.js | 3 +
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 1
13 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ec47bd4..3c85513 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -88,6 +88,7 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setModiTime(now);
+ wrkDetl.setMatType(locDetl.getMatType());
wrkDetl.sync(locDetl);
wrkDetlService.insert(wrkDetl);
@@ -241,6 +242,7 @@
wrkDetl.setOrderNo(orderNo);
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setWrkNo(wrkNo);
+ wrkDetl.setMatType(locDetl.getMatType());
return R.ok().add(wrkDetl);
}
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 3f05251..70f6812 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -418,6 +418,7 @@
wrkDetl.setModiTime(now);
wrkDetl.setAppeUser(1L);
wrkDetl.setModiUser(1L);
+ wrkDetl.setMatType(locDetl.getMatType());
wrkDetlService.insert(wrkDetl);
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index ce3a628..eb75b73 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -271,6 +271,18 @@
return locMast.getLocType2$();
}
+ public Integer getMatType() {
+ if (Cools.isEmpty(this.matnr)) {
+ return null;
+ }
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.selectByMatnr(this.matnr);
+ if (mat == null) {
+ return null;
+ }
+ return mat.getMatType();
+ }
+
public String getMatType$() {
if (Cools.isEmpty(this.matnr)) {
return "";
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 8716473..b37f282 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -338,9 +338,9 @@
private Boolean inoutEveryday;
/**
- * 鐗╂枡绫诲瀷{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
*/
- @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
@TableField("mat_type")
private Integer matType;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 6431820..4d2d2f8 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -274,6 +274,13 @@
@ApiModelProperty(value= "鏄惁鍐荤粨")
private Integer frozen;
+ /**
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ */
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
+ @TableField("mat_type")
+ private Integer matType;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -367,4 +374,20 @@
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/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index c3879d1..351ab4a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -268,6 +268,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ */
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
+ @TableField("mat_type")
+ private Integer matType;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -357,5 +364,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/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ea68b5c..3c0d63a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -467,6 +467,7 @@
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
wrkDetl.setSpecs(locDetl.getSpecs());
+ wrkDetl.setMatType(locDetl.getMatType());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -559,6 +560,7 @@
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
wrkDetl.setSpecs(detlDto.getLocDetl().getSpecs());
+ wrkDetl.setMatType(detlDto.getLocDetl().getMatType());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -645,6 +647,7 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
+ wrkDetl.setMatType(locDetl.getMatType());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -967,6 +970,7 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
+ wrkDetl.setMatType(locDetl.getMatType());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -1456,6 +1460,7 @@
wrkDetl.setAppeUser(9527L);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(9527L);
+ wrkDetl.setMatType(locDetl.getMatType());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index a4a997e..16dc144 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -45,6 +45,7 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+ <result column="mat_type" property="matType" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index b1af620..c67b2e2 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -45,6 +45,7 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+ <result column="mat_type" property="matType" />
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 1920a7b..44076bf 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -262,7 +262,8 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
- ,{field: 'locType2$', align: 'center',title: '涓婃灦鍖哄煙', width: 90}
+ // ,{field: 'locType2$', align: 'center',title: '涓婃灦鍖哄煙', width: 90}
+ ,{field: 'matType$', align: 'center',title: '涓婃灦鍖哄煙'}
]
function getQueryVariable(variable)
diff --git a/src/main/webapp/static/js/pakStore/stockOut2.js b/src/main/webapp/static/js/pakStore/stockOut2.js
index 32248bc..a2f2f20 100644
--- a/src/main/webapp/static/js/pakStore/stockOut2.js
+++ b/src/main/webapp/static/js/pakStore/stockOut2.js
@@ -2,7 +2,7 @@
var locDetlData = [];
function getCol() {
var cols = [
- {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
+ {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', width: 130, style:'color: blue;font-weight: bold'}
,{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺'}
];
arrRemove(detlCols, 'field', 'anfme');
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 6e0e930..35600fd 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -2,7 +2,6 @@
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='姝ｅ父|閿佸畾'' 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 8dcb1db..018767f 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -3,7 +3,6 @@
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='姝ｅ父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.status === 'Y'){html += " checked ";}
--
Gitblit v1.9.1