From 69a9c53039fc5768c5dec6f7dec0c9bdf0cb62e8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 18 十二月 2024 13:30:37 +0800
Subject: [PATCH] #
---
src/main/webapp/views/orderPakout/out.html | 9 +++++++++
src/main/webapp/static/js/orderPakout/out.js | 3 ++-
src/main/java/com/zy/common/model/LocDto.java | 20 +++++++++++++++++---
src/main/java/com/zy/asrs/controller/OutController.java | 12 ++++++------
4 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 4be0c77..752e5b6 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,13 +1,11 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.LocDto;
@@ -74,7 +72,9 @@
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
locDto.setFrozen(locDetl.getFrozen());
+ locDto.setFrozenLoc(locMast.getFrozen());
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
locDto.setStaNos(staNos);
locDtos.add(locDto);
@@ -102,13 +102,13 @@
}
List<LocDto> locDtoArrayList = new ArrayList<>();
for (LocDto locDto : locDtos){
- if (locDto.getFrozen()!=1){
+ if (locDto.getFrozen()!=1 && locDto.getFrozenLoc()!=1){
locDtoArrayList.add(locDto);
}
}
locDtos = locDtoArrayList;
if (Cools.isEmpty(locDtos)) {
- return R.parse(BaseRes.PARAM);
+ return R.parse("搴撳瓨/搴撲綅琚喕缁擄紝璇峰鐞嗗悗鍑哄簱锛侊紒锛�");
}
boolean lack = true;
for (LocDto locDto : locDtos) {
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index fd543b4..3fb9234 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -27,7 +27,9 @@
/**
* 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
*/
- private Integer frozen;
+ private Integer frozen = 1;
+
+ private Integer frozenLoc = 1;
// private Integer frozen$;
@@ -79,11 +81,23 @@
if (null == this.frozen){ return null; }
switch (this.frozen){
case 0:
- return "鏈喕缁�";
+ return "姝ｅ父";
case 1:
return "宸插喕缁�";
default:
- return "鏈喕缁�";
+ return "姝ｅ父";
+ }
+ }
+
+ public String getFrozenLoc$() {
+ if (null == this.frozenLoc){ return null; }
+ switch (this.frozenLoc){
+ case 0:
+ return "姝ｅ父";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "姝ｅ父";
}
}
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index b6ccc03..a7ba719 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -162,7 +162,8 @@
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
- {field: 'frozen$', title: '鍐荤粨', align: 'center', width: 90, templet: '#locFrozen'},
+ {field: 'frozen$', title: '鏄庣粏', align: 'center', width: 90, templet: '#locFrozen'},
+ {field: 'frozenLoc$', title: '搴撲綅', align: 'center', width: 90, templet: '#locFrozenLoc'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
{type: 'checkbox', merge: ['locNo']},
]],
diff --git a/src/main/webapp/views/orderPakout/out.html b/src/main/webapp/views/orderPakout/out.html
index 42c7f1a..3772975 100644
--- a/src/main/webapp/views/orderPakout/out.html
+++ b/src/main/webapp/views/orderPakout/out.html
@@ -210,6 +210,15 @@
{{# } }}
</script>
+<script type="text/html" id="locFrozenLoc">
+ <span name="frozenLoc"
+ {{# if( d.lack === false){ }}
+ class="layui-badge layui-badge-green" >{{d.frozenLoc$}}</span>
+ {{# } else { }}
+ class="layui-badge layui-badge-red" >鏈煡</span>
+ {{# } }}
+</script>
+
<!-- 琛屾牱寮� -->
<script type="text/html" id="orderNoTpl">
<span name="orderNo" class="layui-badge layui-badge-gray">{{d.orderNo}}</span>
--
Gitblit v1.9.1