From 00e89a8c713516855b51fe408debcca0fa44c424 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 19 一月 2026 19:37:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasArmMast.java | 3 +++
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 14 +++++++-------
src/main/webapp/static/js/basArmMast/basArmMast.js | 1 +
src/main/java/com/zy/asrs/controller/OutController.java | 13 +++++++++++--
4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 7fb77b9..38b3a19 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -176,8 +176,17 @@
continue;
}
List<LocDetl> locDetls = null;
- locDetls = locDetlService.queryStockAll123(null, exist,orderDetl.getMatnr(), orderDetl.getBoxType3());
-
+ String cleanOrder = (orderDetl.getBoxType3() != null
+ ? orderDetl.getBoxType3().trim()
+ : "") + "-HDU";
+ locDetls = locDetlService.queryStockAll123(null, exist,
+ orderDetl.getMatnr(), cleanOrder);
+ if(locDetls.size() < 1){
+ locDetls = locDetlService.queryStockAll123(null, exist,
+ orderDetl.getMatnr(), orderDetl.getBoxType3());
+ }
+// List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
+// orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 8b94834..c917376 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -1,9 +1,12 @@
package com.zy.asrs.entity;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.zy.asrs.entity.param.TaskArmReportParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index b6779d6..25ca030 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -4,16 +4,16 @@
BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
BD_RRGANIZATION(2, "渚涘簲鍟�","BD_RRGANIZATION","","","",1),
PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
- SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
+// SAL_OUTSTOCK(7, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",0),
// STK_MisDelivery(19, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","FQty","","",0),
// STK_MISCELLANEOUS(18, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
- SAL_RETURNSTOCK(9, "閿�鍞��璐у崟","SAL_RETURNSTOCK","","","",1),
- PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
- PRD_ReturnMtrl(12, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","","","",1),
- PRD_FeedMtrl(14, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","","","",0),
- PRD_MORPT(16, "鐢熶骇姹囨姤鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","",1),
- OUI_RECEIVEBIll(24, "濮斿鍏ュ簱鍗�","OUI_RECEIVEBIll","","","",1),
+// SAL_RETURNSTOCK(9, "閿�鍞��璐у崟","SAL_RETURNSTOCK","","","",1),
+// PRD_PickMtrl(10, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","","","",0),
+// PRD_ReturnMtrl(12, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","","","",1),
+// PRD_FeedMtrl(14, "鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl","","","",0),
+// PRD_MORPT(16, "鐢熶骇姹囨姤鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","",1),
+// OUI_RECEIVEBIll(24, "濮斿鍏ュ簱鍗�","OUI_RECEIVEBIll","","","",1),
// PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
// STK_TransferDirect(6, "鐩存帴璋冩嫧鍗�","STK_TransferDirect","","FQty","",1),
diff --git a/src/main/webapp/static/js/basArmMast/basArmMast.js b/src/main/webapp/static/js/basArmMast/basArmMast.js
index d0be1a8..c878469 100644
--- a/src/main/webapp/static/js/basArmMast/basArmMast.js
+++ b/src/main/webapp/static/js/basArmMast/basArmMast.js
@@ -51,6 +51,7 @@
pageSize: 'limit'
},
parseData: function (res) {
+ console.log(res);
return {
'code': res.code,
'msg': res.msg,
--
Gitblit v1.9.1