From 6bd36a38fc587ba39bd50e26257ed6ece71363e7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 19 十月 2023 11:30:18 +0800
Subject: [PATCH] 船运问题修改
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 6
igds-web/src/main/resources/static/admin/inout/out-ship-register.js | 88 ++++++++--------
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 9 +
igds-web/src/main/resources/static/admin/inout/in-ship-register.js | 120 ++++++++++++------------
igds-web/src/main/resources/templates/admin/inout/in-ship-register.html | 18 ++
igds-web/src/main/resources/templates/admin/inout/out-ship-register.html | 11 +
6 files changed, 136 insertions(+), 116 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
index c90ac15..ca1f629 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
@@ -227,6 +227,9 @@
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
}
+ if (null == data.getRegisterTime()) {
+ data.setRegisterTime(new Date());
+ }
msg = inoutService.insertData(data);
//鎵ц闄勪欢淇℃伅
@@ -670,8 +673,8 @@
//鑾峰彇浠撳簱淇℃伅
List<Depot> depotList = coreCommonService.getCacheDepotList(param.getCompanyId(), param.getDeptId());
- Map<String,String> map = new HashMap<>();
- if(depotList != null && depotList.size() > 0){
+ Map<String, String> map = new HashMap<>();
+ if (depotList != null && depotList.size() > 0) {
for (Depot depot : depotList) {
map.put(depot.getId(), depot.getName());
}
@@ -679,7 +682,7 @@
//璧嬪�间粨搴撳悕绉�
for (InoutNoticeOut inoutNoticeOut : list) {
- if(map.get(inoutNoticeOut.getDepotId()) != null){
+ if (map.get(inoutNoticeOut.getDepotId()) != null) {
inoutNoticeOut.setDepotName(map.get(inoutNoticeOut.getDepotId()));
}
}
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index b824b24..9e6172d 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -104,14 +104,14 @@
<if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
<if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
+ UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
</if>
AND PROGRESS_ = 'RECORD'
AND RECORD_STATUS_ != 'DEL'
- ORDER BY COMPLETE_TIME_
+ ORDER BY UPDATE_TIME_
</where>
</select>
diff --git a/igds-web/src/main/resources/static/admin/inout/in-ship-register.js b/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
index 062e06a..153b3d2 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
@@ -16,12 +16,12 @@
});
//鐩戝惉鍝佺
- layui.form.on('select(select_foodVariety)',function (data) {
+ layui.form.on('select(select_foodVariety)', function (data) {
updateFoodVariety(data.value);
});
//鐩戝惉鍖栭獙缁撴灉鍗曞～鍐欐暟鎹�,骞剁粰鍑烘彁绀虹粨鏋�
- table.on('edit(tableCheckItem)',function (obj) {
+ table.on('edit(tableCheckItem)', function (obj) {
getResult(obj);
});
});
@@ -147,7 +147,7 @@
/**
* 寮瑰嚭鍖栭獙鍗曚俊鎭�
*/
-function showCheckDetail(){
+function showCheckDetail() {
// 璧嬪��
var data = form.val("form-data");
data.checkUser = checkUser;
@@ -165,7 +165,7 @@
yes: function () {
curCheckData = form.val("form-detail");
- if(null == curCheckData.foodVariety){
+ if (null == curCheckData.foodVariety) {
notify("璇峰～鍐欑伯椋熷搧绉嶏紒");
return;
}
@@ -210,12 +210,12 @@
var index = layer.load();
$.ajax({
- type : "POST",
- url : "../../basic/inout/get-check-item",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(data),
- success : function(result) {
+ type: "POST",
+ url: "../../basic/inout/get-check-item",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
if (result.code != "0000") {
layer.msg(result.msg);
} else {
@@ -225,7 +225,7 @@
layer.close(index);
}
},
- error : function() {
+ error: function () {
layer.close(index);
layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
}
@@ -239,11 +239,11 @@
// 娓呯┖鏁版嵁
$("#tableCheckItem").empty();
table.render({
- elem : '#tableCheckItem',
- data : curCheckItems,
- page : false,
+ elem: '#tableCheckItem',
+ data: curCheckItems,
+ page: false,
// skin: 'line',
- even : true,
+ even: true,
cols: [[{
field: 'standardName',
title: '鍖栭獙椤圭洰',
@@ -274,8 +274,8 @@
});
$("thead tr").css({
- "border-bottom" : "2px solid #53adce",
- "background" : "#eff4f6"
+ "border-bottom": "2px solid #53adce",
+ "background": "#eff4f6"
});
}
@@ -387,7 +387,7 @@
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
elem: '#tableNotice',
- url: '../../basic/inout/list-notice鈥攊n',
+ url: '../../basic/inout/list-notice-in',
page: false,
even: true,
method: 'POST',
@@ -461,54 +461,54 @@
var index = layer.load();
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
- elem : '#tableFoodLoaction',
- url : '../../basic/common/page-food-location',
- page : false,
- toolbar : '#toolbarFoodLocaton',
- even : true,
- method : 'POST',
- contentType : "application/json;charset=UTF-8",
- cols : [ [ {
- field : 'code',
- title : '缂栫爜'
+ elem: '#tableFoodLoaction',
+ url: '../../basic/common/page-dicArea',
+ page: false,
+ toolbar: '#toolbarFoodLocaton',
+ even: true,
+ method: 'POST',
+ contentType: "application/json;charset=UTF-8",
+ cols: [[{
+ field: 'code',
+ title: '缂栫爜'
}, {
- field : 'simple',
- title : '绠�鎷�'
+ field: 'simple',
+ title: '绠�鎷�'
}, {
- field : 'name',
- title : '鍚嶇О',
- width : '60%'
- } ] ],
- where : {
- "page" : 1,
- "limit" : 100
+ field: 'name',
+ title: '鍚嶇О',
+ width: '60%'
+ }]],
+ where: {
+ "page": 1,
+ "limit": 100
},
- parseData : function(res) {
+ parseData: function (res) {
if ("0000" == res.code) {
return {
- "code" : "0",
- "msg" : res.msg,
- "count" : res.data.total,
- "data" : res.data.records
+ "code": "0",
+ "msg": res.msg,
+ "count": res.data.total,
+ "data": res.data.records
}
} else {
return {
- "code" : "1",
- "msg" : res.msg
+ "code": "1",
+ "msg": res.msg
}
}
},
- done : function(res) {
+ done: function (res) {
layer.close(index);
}
});
//鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableFoodLoaction)', function(obj){
+ table.on('rowDouble(tableFoodLoaction)', function (obj) {
var data = obj.data;
// 璧嬪��
form.val("form-data", {
- foodLocation : data.name
+ foodLocation: data.name
});
// 鍏抽棴
layer.close(index2);
@@ -516,18 +516,18 @@
// 寮瑰嚭瀵硅瘽妗�
var index2 = layer.open({
- type : 1,
- title : "閫夋嫨绮骇鍦�",
- area : [ '600px', '600px' ],
- shade : 0,
- content : $('#listFoodLocation'),
- btn : 0,
- btn : [ '鍙栨秷' ],
- yes : function() {
+ type: 1,
+ title: "閫夋嫨绮骇鍦�",
+ area: ['600px', '600px'],
+ shade: 0,
+ content: $('#listFoodLocation'),
+ btn: 0,
+ btn: ['鍙栨秷'],
+ yes: function () {
// 鍏抽棴
layer.close(index2);
},
- closeBtn : 0
+ closeBtn: 0
});
}
@@ -536,11 +536,11 @@
function flushFoodLocation() {
var key = $("#key2").val();
table.reload('tableFoodLoaction', {
- url : "../../basic/common/page-food-location",
- where : {
- key : key
+ url: "../../basic/common/page-dicArea",
+ where: {
+ key: key
},
- done : function(res) {
+ done: function (res) {
if (key) {
$("#key2").val(key);
}
diff --git a/igds-web/src/main/resources/static/admin/inout/out-ship-register.js b/igds-web/src/main/resources/static/admin/inout/out-ship-register.js
index 5f7315c..5175132 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-ship-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-ship-register.js
@@ -16,7 +16,7 @@
});
// 鐩戝惉浠撳簱閫夋嫨锛岄�夋嫨鍚庤嚜鍔ㄨ皟鐢ㄤ粨搴撶殑绮搧绉嶅拰浜у湴淇℃伅
- form.on('select(select_depotId)', function(obj) {
+ form.on('select(select_depotId)', function (obj) {
updateFoodVarietyByDepot(obj.value);
});
});
@@ -207,7 +207,7 @@
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
elem: '#tableNotice',
- url: '../../basic/inout/list-notice鈥攐ut',
+ url: '../../basic/inout/list-notice-out',
page: false,
// skin : "nob",
// size : 'sm',
@@ -288,54 +288,54 @@
var index = layer.load();
// 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
- elem : '#tableFoodLoaction',
- url : '../../basic/common/page-food-location',
- page : false,
- toolbar : '#toolbarFoodLocaton',
- even : true,
- method : 'POST',
- contentType : "application/json;charset=UTF-8",
- cols : [ [ {
- field : 'code',
- title : '缂栫爜'
+ elem: '#tableFoodLoaction',
+ url: '../../basic/common/page-dicArea',
+ page: false,
+ toolbar: '#toolbarFoodLocaton',
+ even: true,
+ method: 'POST',
+ contentType: "application/json;charset=UTF-8",
+ cols: [[{
+ field: 'code',
+ title: '缂栫爜'
}, {
- field : 'simple',
- title : '绠�鎷�'
+ field: 'simple',
+ title: '绠�鎷�'
}, {
- field : 'name',
- title : '鍚嶇О',
- width : '60%'
- } ] ],
- where : {
- "page" : 1,
- "limit" : 100
+ field: 'name',
+ title: '鍚嶇О',
+ width: '60%'
+ }]],
+ where: {
+ "page": 1,
+ "limit": 100
},
- parseData : function(res) {
+ parseData: function (res) {
if ("0000" == res.code) {
return {
- "code" : "0",
- "msg" : res.msg,
- "count" : res.data.total,
- "data" : res.data.records
+ "code": "0",
+ "msg": res.msg,
+ "count": res.data.total,
+ "data": res.data.records
}
} else {
return {
- "code" : "1",
- "msg" : res.msg
+ "code": "1",
+ "msg": res.msg
}
}
},
- done : function(res) {
+ done: function (res) {
layer.close(index);
}
});
//鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableFoodLoaction)', function(obj){
+ table.on('rowDouble(tableFoodLoaction)', function (obj) {
var data = obj.data;
// 璧嬪��
form.val("form-data", {
- foodLocation : data.name,
+ foodLocation: data.name,
});
// 鍏抽棴
layer.close(index2);
@@ -343,18 +343,18 @@
// 寮瑰嚭瀵硅瘽妗�
var index2 = layer.open({
- type : 1,
- title : "閫夋嫨绮骇鍦�",
- area : [ '600px', '600px' ],
- shade : 0,
- content : $('#listFoodLocation'),
- btn : 0,
- btn : [ '鍙栨秷' ],
- yes : function() {
+ type: 1,
+ title: "閫夋嫨绮骇鍦�",
+ area: ['600px', '600px'],
+ shade: 0,
+ content: $('#listFoodLocation'),
+ btn: 0,
+ btn: ['鍙栨秷'],
+ yes: function () {
// 鍏抽棴
layer.close(index2);
},
- closeBtn : 0
+ closeBtn: 0
});
}
@@ -363,11 +363,11 @@
function flushFoodLocation() {
var key = $("#key2").val();
table.reload('tableFoodLoaction', {
- url : "../../basic/common/page-food-location",
- where : {
- key : key
+ url: "../../basic/common/page-dicArea",
+ where: {
+ key: key
},
- done : function(res) {
+ done: function (res) {
if (key) {
$("#key2").val(key);
}
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html b/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html
index 1b7f686..689c1bb 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-ship-register.html
@@ -37,18 +37,21 @@
}
.rkbk-right-form .layui-input-block {
- margin-right: unset;
+ margin-right: unset;
}
+
.layui-form-item .layui-input-inline {
width: unset;
}
- .rkbk-search-input{
+ .rkbk-search-input {
background: #FFF !important;
}
+
.rkbk-search-input.bg-date {
background: #FFF !important;
}
+
.layui-select-disabled .layui-disabled {
color: #000 !important;
}
@@ -61,6 +64,7 @@
padding: 10px;
color: blue;
}
+
.layui-form-selected dl {
max-height: 150px;
}
@@ -164,7 +168,8 @@
<!--rk-form-left end-->
<div class="rkbk-photo">
- <a href="#"><img id="id_img_pers" th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
+ <a href="#"><img id="id_img_pers"
+ th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
</div>
</div>
@@ -257,6 +262,9 @@
</select>
</div>
</div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="foodLocationId">
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">瑁呭嵏浠撳簱锛�</label>
<div class="layui-input-block">
@@ -311,6 +319,8 @@
var listDepot = [[${listDepot}]];
//褰撳墠鑺傜偣
+ //鍝佺
+ var listFoodVariety = [[${listFoodVariety}]];
//涓氬姟姝ラ
var bizType = [[${bizType}]];
var checkUser = [[${checkUser}]];
@@ -320,13 +330,13 @@
var userId = [[${loginUser.username}]];
var companyId = [[${loginUser.companyId}]];
//杞︾墝璇嗗埆
- var listFoodVariety = [[${listFoodVariety}]];
</script>
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/in-ship-register.js}"></script>
<!-- 寮瑰嚭閫氱煡鍗� -->
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html b/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html
index 140af84..be0af73 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-ship-register.html
@@ -33,17 +33,21 @@
}
.rkbk-right-form .layui-input-block {
- margin-right: unset;
+ margin-right: unset;
}
+
.layui-form-item .layui-input-inline {
width: unset;
}
- .rkbk-search-input{
+
+ .rkbk-search-input {
background: #FFF !important;
}
+
.rkbk-search-input.bg-date {
background: #FFF !important;
}
+
.layui-select-disabled .layui-disabled {
color: #000 !important;
}
@@ -51,6 +55,7 @@
.layui-table td {
font-weight: bold;
}
+
.layui-form-selected dl {
max-height: 150px;
}
@@ -300,6 +305,7 @@
var userId = [[${loginUser.username}]];
var companyId = [[${loginUser.companyId}]];
//杞︾墝璇嗗埆
+ //鍝佺
var listFoodVariety = [[${listFoodVariety}]];
</script>
@@ -307,6 +313,7 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/out-ship-register.js}"></script>
<!-- 寮瑰嚭閫氱煡鍗� -->
--
Gitblit v1.9.3