From f94c385c049ec9d4ad5e6ca862d030736181526b Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Thu, 25 Apr 2024 14:46:22 +0800
Subject: [PATCH] feat:修复待入库明细里面，主体颜色没有取到值的问题。
---
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java | 2 +-
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java b/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
index 91f6798..9f7b446 100644
--- a/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
+++ b/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
@@ -188,7 +188,7 @@ public class MesServiceImpl implements IMesService {
receiptDetail.setProductionWorker(receiptHeader.getProductionWorker());
receiptDetail.setProductionWorkerName(receiptHeader.getProductionWorkerName());
receiptDetail.setPaintStatus(receiptHeader.getPaintStatus());
-
+ receiptDetail.setMaterialColor(receiptHeader.getMaterialColor());
//判断是否为必须入库平库物料，通知单号带“展会”两个字的物料也必须入平库
if (material == null || !judgeIsFlatWarehouse(material, receiptDetail.getNoticeNo())) {
diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
index ae66911..2182a2a 100644
--- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
@@ -132,7 +132,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
}
}
if (bigContainerLocations.isEmpty()) {
- return null;
+ return "可能是大托盘库位不够用了";
}
if (entry && bigContainerLocations.size() <= 4) {//留4个大托盘库位移库用
return "可能是大托盘库位不够用了";
--
libgit2 0.22.2