From 71e2c4b6e73131b6415c8c239e70c95be94ec73e Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 08 十一月 2022 10:00:29 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 5 +++++
version/边锋数据库改动20221028/边锋数据库改动.md | 2 ++
src/main/webapp/views/locMast/locMast_detail.html | 6 ++++++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 ++
src/main/java/com/zy/common/web/WcsController.java | 1 +
src/main/webapp/static/js/locMast/locMast.js | 5 +++--
src/main/java/com/zy/asrs/entity/LocMast.java | 7 +++++++
7 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index ccb8433..92eb5ac 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -182,6 +182,13 @@
@ApiModelProperty(value= "鏄惁鍐荤粨")
private Integer frozen;
+ /**
+ * 鍐荤粨澶囨敞
+ */
+ @ApiModelProperty(value= "鍐荤粨澶囨敞")
+ @TableField("frozen_memo")
+ private String frozenMemo;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
BasWhs basWhs = service.selectById(this.whsType);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 0538030..0a7f1ee 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -130,6 +130,7 @@
locMast.setFrozen(wrkMast.getFrozen());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setFrozenMemo(wrkMast.getMemo());
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -351,6 +352,7 @@
locMast.setFrozen(0);
locMast.setModiTime(now);
locMast.setIoTime(now);
+ locMast.setFrozenMemo("");
if (!locMastService.updateById(locMast)) {
exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3652900..565d014 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -142,6 +142,7 @@
if(waitPakins.size()>0) {
WaitPakin one = waitPakins.get(0);
wrkMast.setFrozen(one.getFrozen());
+ wrkMast.setMemo(one.getMemo());
}
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 7f3f779..8ed580c 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -28,6 +28,7 @@
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��'}
+ ,{field: 'frozenMemo', align: 'center',title: '鍐荤粨鍘熷洜'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
@@ -65,7 +66,6 @@
pageSize: 'limit'
},
parseData: function (res) {
- console.log(res)
return {
'code': res.code,
'msg': res.msg,
@@ -460,7 +460,8 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
- frozen: $('#frozen').val()
+ frozen: $('#frozen').val(),
+ frozenMemo: $('#frozenMemo').val()
};
$.ajax({
url: baseUrl+"/locMast/"+name+"/auth",
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index b736512..12ed88a 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -36,6 +36,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="frozen" placeholder="鍐荤粨鐘舵��" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="row1" placeholder="鎺�" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index fe5203c..73acddb 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -89,6 +89,12 @@
</div>
</div>
<div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鍐荤粨鍘熷洜锛�</label>
+ <div class="layui-input-inline">
+ <input id="frozenMemo" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:80%;">
<label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
<div class="layui-input-inline">
<input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled">
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 7f7e128..ac3c807 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"
@@ -37,5 +37,7 @@
cust_wait_pakin
cust_wait_pakin_log
asr_wrk_detl
+
+asr_loc_mast + frozen_memo (varchar(255)
```
--
Gitblit v1.9.1