From 8e711598e5042d45e7d3be978b43a9e74425cff1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 02 六月 2023 11:04:10 +0800
Subject: [PATCH] #拣货单单据未出标红
---
src/main/webapp/static/js/picking/picking.js | 27 ++++++++++++++++++++++++---
src/main/webapp/views/home/map.html | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 4 +---
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/controller/OutController.java | 2 +-
5 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 2d60d53..3c6de9a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -116,7 +116,7 @@
}
}
if (Cools.isEmpty(locDtos)) {
- return R.error("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
+ return R.ok("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
}
boolean lack = true;
for (LocDto locDto : locDtos) {
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index 81546df..8459f67 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -118,6 +118,10 @@
manLocDetl.setCreateTime(now);
manLocDetl.setModiTime(now);
manLocDetl.setCreateBy(userId);
+ String uuid = String.valueOf(System.currentTimeMillis());
+ manLocDetl.setUuid(uuid);
+ manLocDetl.setStatus(1);
+ manLocDetl.setPayment(1);
SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
manLocDetlService.insert(manLocDetl);
}else {
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0997986..26091f2 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -270,9 +270,7 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
- <if test="batch != null">
- and a.batch = #{batch}
- </if>
+
<choose>
<when test="owner != null and owner !=0">
and a.owner = #{owner}
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 1f288b2..553fb28 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -26,7 +26,7 @@
// {type: 'checkbox'}
{type: 'numbers'}
,{field: 'wrkNo', align: 'center',title: 'id', hide:true}
- ,{field: 'docNum',title: '鎷ｈ揣鍗曞彿' , templet: '#orderNoTpl'}
+ ,{field: 'docNum',title: '鎷ｈ揣鍗曞彿' }
,{align: 'center', title: '浜岀淮鐮�', toolbar: '#operate', width: 200 , hide:true}
,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -59,6 +59,14 @@
}
pageCurr=curr;
limit();
+
+ var index = -1;
+ $("[data-field='status$']").children().each(function () {
+ index++;
+ if ($(this).text() === '鏈嚭搴�') {
+ $('tr').eq(index).css("color", 'red');
+ }
+ });
}
});
@@ -97,13 +105,14 @@
type: 1,
title: false,
area: '1200px',
- offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
+ offset: [top + 'px', (left - 450 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
success: function (layero) {
table.render({
+ id:'lookSSXMTable',
elem: '#lookSSXMTable',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/ManPakOut/list/auth',
@@ -147,8 +156,18 @@
response: {
statusCode: 200
},
- done: function () {
+ done: function (res) {
$(layero).find('.layui-table-view').css('margin', '0');
+
+ var index = -1;
+ $("[data-field='status$']").children().each(function () {
+ index++;
+ if ($(this).text() === '鏈嚭搴�') {
+ $('tr').eq(index).css("color", 'red');
+ }
+ });
+
+
},
size: ''
});
@@ -302,6 +321,8 @@
+
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 8348e6d..0c01d84 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -44,7 +44,7 @@
color: #fff;
/*transform: perspective(130px) rotateX(30deg) translateZ(-20px);*/
box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
- border-radius: 50% 20% / 10% 40%;
+ /*border-radius: 50% 20% / 10% 40%;*/
}
.pointBox:hover{
--
Gitblit v1.9.1