From 5accf28a1641132dfd014a23bd54b37752bce8ca Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 28 十一月 2022 13:41:20 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 8 +++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 +
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/webapp/views/order/out.html | 26 +++++++++++++
src/main/java/com/zy/common/model/LocDto.java | 15 +++++++
src/main/java/com/zy/asrs/controller/OutController.java | 10 +++-
6 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0d2ba7d..d158b04 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -67,9 +67,13 @@
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
+// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+// issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
+ //閫熻吘鍙湁鍏ㄦ澘锛屾墍浠ュ彧鑳�101鍏ㄦ澘鍑哄簱
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
locDto.setStaNos(staNos);
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
@@ -80,7 +84,7 @@
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index d02fdd3..8955567 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -289,7 +289,9 @@
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(taskDto.getLocNo());
// 鑾峰彇璺緞
- int ioType = taskDto.isAll() ? 101 : 103;
+// int ioType = taskDto.isAll() ? 101 : 103;
+ //浠呴�傜敤浜庨�熻吘椤圭洰锛屾病鏈夋崱鏂�
+ int ioType = 101;
StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index ca099a3..1638e04 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,7 @@
package com.zy.common.model;
import com.core.common.Cools;
+import lombok.AllArgsConstructor;
import lombok.Data;
import java.util.List;
@@ -21,7 +22,11 @@
private String orderNo;
+ //瀹為檯鍑哄簱閲�
private Double anfme;
+
+ //鎵�闇�鍑哄簱閲�
+ private Double needQty;
private boolean lack = false;
@@ -56,6 +61,16 @@
this.anfme = anfme;
}
+ public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme, Double needQty) {
+ this.locNo = locNo;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ this.needQty = needQty;
+ }
+
public String getTitle() {
return this.matnr + "锛�" + this.maktx + "锛�";
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 8ed8f84..b188922 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -210,7 +210,7 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
- <if test="batch != null and batch != ''">
+ <if test="batch != null">
and a.batch = #{batch}
</if>
<if test="orderNo != null and orderNo != ''">
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index be85831..0643b0b 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -4,7 +4,7 @@
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
-}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge', 'tableX'], function(){
+}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge', 'tableX' , 'laytpl'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -17,6 +17,7 @@
var xmSelect = layui.xmSelect;
var tableMerge = layui.tableMerge;
var tableX = layui.tableX;
+ var laytpl = layui.laytpl;
insTb2 = table.render({
elem: '#orderDetlTable',
@@ -148,6 +149,7 @@
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
,content: $('#pakoutPreviewBox').html()
,success: function(layero, index){
+ console.log(res.data);
stoPreTabIdx = table.render({
elem: '#stoPreTab',
data: res.data,
@@ -160,7 +162,9 @@
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
- {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ { title: '闇�姹傛暟閲�', align: 'center' , width: 90, toolbar: '#checkNeedQty'},
+ // {field: 'anfme', title: '瀹為檯鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ { title: '瀹為檯鏁伴噺', align: 'center', width: 90, toolbar: '#checkAnfme'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
{type: 'checkbox', merge: ['locNo']},
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 9a59d23..f2290f4 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -270,6 +270,32 @@
</form>
</script>
+<!--鏍规嵁闇�姹傚嚭搴撻噺鍜屽疄闄呭嚭搴撻噺鍋氬姣旓紝灞曠ず涓嶅悓棰滆壊-->
+<script type="text/html" id="checkAnfme">
+ {{# if(d.needQty < d.anfme){ }}
+ <span style="color: red; font-weight: bold;" >{{d.anfme}}</span>
+ {{# } }}
+ {{# if(d.needQty == d.anfme){ }}
+ <span style="font-weight: bold;" >{{d.anfme}}</span>
+ {{# } }}
+
+ {{# if(d.needQty > d.anfme){ }}
+ <span style="color: red;font-weight: bold;" >{{d.anfme}}</span>
+ {{# } }}
+</script>
+
+<script type="text/html" id="checkNeedQty">
+ {{# if(d.needQty < d.anfme){ }}
+ <span style="color: red; font-weight: bold;" >{{d.needQty}}</span>
+ {{# } }}
+ {{# if(d.needQty == d.anfme){ }}
+ <span style="font-weight: bold;" >{{d.needQty}}</span>
+ {{# } }}
+ {{# if(d.needQty > d.anfme){ }}
+ <span style="color: red;font-weight: bold;" >{{d.needQty}}</span>
+ {{# } }}
+</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
--
Gitblit v1.9.1