From ce622406a2064d8b60d50c01cf3d490c2c5de736 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 13:31:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 6e8e66e..91e053b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatUtils;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
@@ -273,7 +274,10 @@
throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
}
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ Mat analyse = MatUtils.analyseMat(elem.getMatnr());
+ // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -286,10 +290,10 @@
if (packDown) {
MesCombParam mesCombParam = new MesCombParam();
mesCombParam.setZpallet(param.getBarcode());
- mesCombParam.setCombTime(DateUtils.convert(now));
+ mesCombParam.setPakinTime(DateUtils.convert(now));
mesCombParam.setLgort("5008");
for (DetlDto detlDto : detlDtos) {
- mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getMatnr(), detlDto.getAnfme()));
+ mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
}
String response = "";
boolean success = false;
@@ -381,7 +385,7 @@
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
// 淇敼鎵撳寘鏁版嵁鐘舵��
- Pack pack = packService.selectByBarcode(detlDto.getMatnr());
+ Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
pack.setSettle(2L);
pack.setUpdateTime(now);
pack.setUpdateBy(userId);
--
Gitblit v1.9.1