From c356310bd2a40b8b3742e9097b52d2053e4761a6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 十月 2025 14:51:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 24 +++++++++++++-----------
src/main/webapp/static/js/order/order.js | 23 ++++++++++++-----------
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4c1bd74..4fcd85b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -264,19 +264,21 @@
totalQty = totalQty + orderDetl.getAnfme();
wrkQty = wrkQty + orderDetl.getWorkQty();
endQty = endQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- issued = issued - locDetl.getAnfme();
- } else {
- break;
+ if (!Cools.isEmpty(order.getPakinPakoutStatus$()) && order.getPakinPakoutStatus$().equals("N")){
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued > 0.0) {
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
}
}
- }
- if (issued > 0.0) {
- lackQty = lackQty + issued;
+ if (issued > 0.0) {
+ lackQty = lackQty + issued;
+ }
}
}
// 浠诲姟杩芥函
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6fd6cab..7fc8788 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -43,6 +43,7 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'po', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
@@ -124,13 +125,13 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '寰呭畬缁撴暟閲�'},
- {field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold'},
- {field: 'workQty', title: '宸蹭笂鎶ユ暟閲�'},
+ {field: 'matnr', title: 'sku', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 80},
+ {field: 'supp', title: 'po'},
+ {field: 'sku', title: 'upc'},
+ {field: 'anfme', title: '鏁伴噺', width: 80},
+ {field: 'qty', title: '涓婃姤鏁伴噺', style: 'font-weight: bold'},
+ {field: 'workQty', title: '鍘嗗彶涓婃姤鏁伴噺'},
// {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -541,7 +542,7 @@
var traceCharts = echarts.init(document.getElementById('wrkTraceCharts'));
var traceOptions = {
title: {
- text: '浣滀笟/瀹岀粨/涓婃姤', x: 'center', y: '38%',
+ text: '鎬婚噺/寰呬笂鎶�/宸蹭笂鎶�', x: 'center', y: '38%',
textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
subtextStyle: {fontSize: 36, color: '#10B4E8'},
itemGap: 20
@@ -554,13 +555,13 @@
// 璧嬪��
traceCharts.setOption({
title: {
- subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
+ subtext: res.data.totalQty+"/"+res.data.endQty+"/"+res.data.wrkQty
},
series: [
{
data: [
- {name: '宸蹭綔涓�', value: res.data.wrkQty},
- {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.lackQty},
+ {name: '宸蹭綔涓�', value: res.data.wrkQty+res.data.endQty},
+ {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.endQty-res.data.lackQty},
{name: '搴撳瓨涓嶈冻', value: res.data.lackQty},
]
}
--
Gitblit v1.9.1