From 103c9cfb51142885dd2b5e7332e6de3bf63d631a Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 28 十月 2022 15:46:02 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 5 ++++-
src/main/resources/mapper/MatMapper.xml | 1 +
src/main/webapp/views/mat/mat.html | 9 +++++++++
src/main/java/com/zy/asrs/entity/Mat.java | 17 +++++++++++++++++
src/main/webapp/static/js/common.js | 2 ++
src/main/java/com/zy/asrs/controller/OutController.java | 3 ++-
6 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 50e7ad1..10f209d 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -206,7 +206,8 @@
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
+ int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo()));
+ int ioType = (issued >= locDetl.getAnfme() && count == 1 ? 101 : 103);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
locDto.setStaNos(staNos);
locDtos.add(locDto);
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 95beb7b..aae5257 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -315,6 +315,12 @@
@TableField("store_max_date")
private Integer storeMaxDate;
+ /**
+ * 鏄惁涓洪绻佸叆鍑哄簱鐗╂枡
+ */
+ @TableField("inout_everyday")
+ private Boolean inoutEveryday;
+
public Mat() {}
@@ -526,4 +532,15 @@
}
}
+ public String getInoutEveryday$(){
+ if (this.inoutEveryday == null){
+ return "鍚�";
+ }
+ if (this.inoutEveryday){
+ return "鏄�";
+ }else {
+ return "鍚�";
+ }
+ }
+
}
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 04a0a12..6ec9eef 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -46,6 +46,7 @@
<result column="store_max" property="storeMax" />
<result column="store_min" property="storeMin" />
<result column="store_max_date" property="storeMaxDate" />
+ <result column="inout_everyday" property="inoutEveryday" />
</resultMap>
<select id="listByPage" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index ea4a044..7698016 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -222,6 +222,8 @@
,{field: 'storeMax$', align: 'center',title: '搴撳瓨涓婇檺'}
,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'}
,{field: 'storeMaxDate$', align: 'center',title: '鏈�澶ф粸鐣欐椂闂�'}
+ ,{field: 'inoutEveryday$', align: 'center',title: '棰戠箒鍏ュ嚭搴撶墿鏂�'}
+
]
var detlCols = [
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 0687db2..ffcb4eb 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -258,6 +258,8 @@
}
,yes: function(index, layero){
//鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
+ console.log('261琛�')
+ console.log(tableCache);
pakout(tableCache, index);
}
,btn2: function(index, layero){
@@ -533,7 +535,6 @@
mergeTabCache[i]['staNo'] = batchSta;
arr.push(i);
}
- console.log(mergeTabCache)
stoPreTabMergeIdx.reload({data: mergeTabCache});
arr.forEach(item => {
$('div[lay-id=stoPreTabMerge] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
@@ -555,6 +556,8 @@
}
,yes: function(index, layero){
//鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
+ console.log('560')
+ console.log(mergeTabCache);
pakout(mergeTabCache, index);
}
,btn2: function(index, layero){
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 88b9e2e..7744925 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -209,6 +209,15 @@
<input name="storeMaxDate" placeholder="鏈�澶ф粸鐣欐椂闂�(澶�)" type="number" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">棰戠箒鍏ュ嚭搴撶墿鏂�</label>
+ <div class="layui-input-block">
+ <select name="inoutEveryday" lay-vertype="tips" lay-verify="required" required="">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
</div>
--
Gitblit v1.9.1