From 765a856097731e6d01ada01e1083a6c3e7a282cf Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 01 十一月 2022 14:09:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/webapp/views/locDetl/locDetl.html | 2 +-
version/边锋数据库改动20221028/边锋数据库改动.md | 6 ++++++
src/main/webapp/views/locMast/locMast_detail.html | 11 +++++++++++
src/main/java/com/zy/asrs/controller/LocMastController.java | 4 ++++
src/main/resources/mapper/LocDetlMapper.xml | 14 +++++++-------
src/main/webapp/static/js/locMast/locMast.js | 6 +++---
src/main/webapp/static/js/stoMan/stoQue.js | 1 +
src/main/java/com/zy/asrs/entity/LocMast.java | 11 +++++++++++
8 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 96adfe8..58a0432 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -107,6 +107,10 @@
return R.error();
}
+ if (!locMast.getLocSts().equals("F") && !Cools.isEmpty(locMast.getFrozen()) && locMast.getFrozen() == 1) {
+ return R.error("搴撳瓨鍦ㄥ簱鐘舵�佹墠鑳藉喕缁�");
+ }
+
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("source_loc_no", locMast.getLocNo())
.or().eq("loc_no", locMast.getLocNo()));
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd5f3ba..ccb8433 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -295,4 +295,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getFrozen$() {
+ if (null == this.frozen){ return null; }
+ switch (this.frozen){
+ case 0:
+ return "";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return null;
+ }
+ }
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 56989cd..65c7636 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -236,7 +236,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 1
and b.row1 <= 3
@@ -249,7 +249,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 4
and b.row1 <= 7
@@ -262,7 +262,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 8
and b.row1 <= 11
@@ -275,7 +275,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 12
and b.row1 <= 14
@@ -288,7 +288,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 15
and b.row1 <= 18
@@ -301,7 +301,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 19
and b.row1 <= 21
@@ -364,7 +364,7 @@
)
and a.matnr = #{matnr}
and b.bay1 = #{bay}
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
order by b.row1 asc
</select>
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 1bb10e3..7f3f779 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -27,7 +27,7 @@
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
- ,{field: 'frozen', align: 'center',title: '鍐荤粨鐘舵��'}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
@@ -57,7 +57,7 @@
,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
-
+ // ,{field: 'frozen$', align: 'center',title: '鏄惁鍐荤粨'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
@@ -460,7 +460,7 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
-
+ frozen: $('#frozen').val()
};
$.ajax({
url: baseUrl+"/locMast/"+name+"/auth",
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index a4630e5..3f61c80 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -39,6 +39,7 @@
html += "disabled='disabled' >";
return html;
},width:80}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index dad6b6c..bc4604c 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -45,7 +45,7 @@
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>
+<!-- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
</div>
</div>
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 1e12d40..fe5203c 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -77,6 +77,17 @@
<input id="sheetNo" class="layui-input" type="text">
</div>
</div>
+ <!-- 鍐荤粨 -->
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鍐荤粨</label>
+ <div class="layui-input-inline">
+ <select id="frozen" name="frozen">
+ <option style="display: none"></option>
+ <option value="0">鏈喕缁�</option>
+ <option value="1">鍐荤粨</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline" style="width:80%;">
<label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
<div class="layui-input-inline">
diff --git "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md" "b/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md"
index 1190b54..f64e0f4 100644
--- "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md"
+++ "b/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md"
@@ -23,3 +23,9 @@
asr_check_record
```
+鏂板鍐荤粨瀛楁frozen int 榛樿鍊�0
+缁勬墭妗ｏ細鍏ュ簱閫氱煡妗�/鍘嗗彶妗ｈ〃
+宸ヤ綔涓绘。/鍘嗗彶妗�
+搴撳瓨妗�
+宸叉湁搴撳瓨鏁版嵁闇�瑕佸垵濮嬪寲frozen鍊间负0
+
--
Gitblit v1.9.1