From db8aa910cbdc2ac6577be8d2f87031e7ce6d1091 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 四月 2022 15:28:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/entity/Parameter.java | 18 ++++--------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 29 ++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 15 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 07e7cef..391ac3f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.service.*;
+import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +42,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private PackService packService;
@Override
@Transactional
@@ -70,6 +73,7 @@
detlDtos.add(detlDto);
}
});
+
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
@@ -236,12 +240,24 @@
}
Date now = new Date();
+ boolean packDown = Parameter.get().getPackDown().equals("true");
+
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
+ // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
+ if (packDown) {
+ Pack pack = packService.selectByBarcode(elem.getMatnr());
+ if (pack == null) {
+ throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
+ }
+ if (pack.getSettle() != 1) {
+ throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
+ }
+ }
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
@@ -251,6 +267,10 @@
detlDtos.add(detlDto);
}
});
+
+ if (packDown) {
+ // 鏁版嵁涓婃姤 todo
+ }
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
@@ -271,8 +291,15 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
+ // 淇敼鎵撳寘鏁版嵁鐘舵��
+ Pack pack = packService.selectByBarcode(detlDto.getMatnr());
+ pack.setSettle(2L);
+ pack.setUpdateTime(now);
+ pack.setUpdateBy(userId);
+ if (!packService.updateById(pack)) {
+ throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
+ }
}
- // 鍏宠仈缁勬墭
}
}
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index 91e7c65..0eb52b5 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -6,6 +6,7 @@
import com.zy.system.service.ConfigService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import lombok.Data;
import java.util.HashMap;
import java.util.List;
@@ -14,6 +15,7 @@
/**
* 鍩虹閰嶇疆涓績銆傚彲閫氳繃鍒锋柊鎸囧畾鎺ュ彛鍒锋柊鐩稿叧閰嶇疆
*/
+@Data
public class Parameter {
private volatile static Parameter instance = null;
@@ -52,22 +54,10 @@
// 楠岃瘉鐮佸紑鍏�
private String codeSwitch;
- public String getCodeSwitch() {
- return codeSwitch;
- }
-
- public void setCodeSwitch(String codeSwitch) {
- this.codeSwitch = codeSwitch;
- }
-
// 搴撲綅鍒濆鍖栧彛浠�
private String locMastInitPwd;
- public String getLocMastInitPwd() {
- return locMastInitPwd;
- }
+ // 鎵撳寘涓嬬嚎
+ private String packDown;
- public void setLocMastInitPwd(String locMastInitPwd) {
- this.locMastInitPwd = locMastInitPwd;
- }
}
--
Gitblit v1.9.1