From ea92b2e7bb48c55f7ec2cf52dfdb2497f30b49ce Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 21 十二月 2025 09:44:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 82470a0..8309015 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -99,6 +99,9 @@
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+
@Resource
private MatMapper matMapper;
@@ -116,6 +119,14 @@
@Resource
private BasCrnpMapper basCrnpMapper;
+
+ @Resource
+ private ReviewService reviewService;
+
+
+ @Resource
+ private ReviewDetlService reviewDetlService;
+
@Override
@Transactional
@@ -1260,7 +1271,7 @@
// 绠卞彿
HashMap<String, Object> zz = new HashMap<>();
List<GwmsGenerateInventoryDto.Rolls> rolls = obj.getRolls();
- for(GwmsGenerateInventoryDto.Rolls roll :rolls) {
+ for (GwmsGenerateInventoryDto.Rolls roll : rolls) {
barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("model", roll.getRollNo()));
if (barcodeCount2 > 0) {
throw new CoolException("鍗峰彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + roll.getRollNo());
@@ -1682,7 +1693,7 @@
// 瀵绘壘绌烘墭鐩樺簱浣嶏紝鍏堟壘娴呭簱浣�
List<LocMast> locMasts;
locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D")
- .orderAsc(Arrays.asList("row1", "lev1", "bay1")).in("crn_no", crnNoList).in("row1", 3, 4, 6, 7, 10, 11, 14, 15, 18, 19, 22, 23));
+ .orderAsc(Arrays.asList("row1", "lev1", "bay1")).in("crn_no", crnNoList).in("row1", 2, 3, 6, 7, 10, 11, 14, 15, 18, 19, 22, 23));
if (locMasts.isEmpty()) {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D")
.orderAsc(Arrays.asList("row1", "lev1", "bay1")).in("crn_no", crnNoList).in("row1", 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21, 24));
@@ -2385,6 +2396,70 @@
@Override
@Transactional
+ public R groupOrderConfirmV2(GroupOrderConfirmParam param) {
+ // 1. 鏌ヨ鍗曟嵁鏄惁瀛樺湪
+ String time = DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F);
+ Review review = reviewService.selectOne(new EntityWrapper<Review>().eq("order_no", param.getGroupOrderNumber()));
+ if (review == null) {
+ review = new Review();
+ review.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ review.setOrderNo(param.getGroupOrderNumber());
+ review.setOrderTime(time);
+ review.setDefNumber("绯荤粺鍚屾");
+ review.setSettle(1L);
+ review.setStatus(1);
+ review.setCreateBy(9527L);
+ review.setCreateTime(new Date());
+
+ reviewService.insert(review);
+ review = reviewService.selectOne(new EntityWrapper<Review>().eq("order_no", param.getGroupOrderNumber()));
+ } else {
+ // 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
+ review.setSettle(1L);
+ reviewService.updateById(review);
+ }
+ reviewService.delete(
+ new EntityWrapper<Review>().eq("order_no", param.getGroupOrderNumber())
+ );
+
+ // 2. 涓�涓�瀵瑰簲閬嶅巻
+ List<GroupOrderConfirmParam.PackageGroupNo> pkgList = param.getPackageGroupNos();
+ List<GroupOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();
+
+ int size = Math.min(pkgList.size(), volList.size()); // 闃叉瓒婄晫
+ for (int i = 0; i < size; i++) {
+ GroupOrderConfirmParam.PackageGroupNo pg = pkgList.get(i);
+ GroupOrderConfirmParam.VolumeNumber vn = volList.get(i);
+
+ // 鏌ヨ鏄惁宸插瓨鍦ㄨ detl
+ ReviewDetl detl = reviewDetlService.selectOne(new EntityWrapper<ReviewDetl>().eq("order_no", param.getGroupOrderNumber()).eq("brand", pg.getPackageGroupNo()).eq("model", vn.getVolumeNumber()));
+
+ if (detl == null) {
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().eq("brand", pg.getPackageGroupNo()).eq("model", vn.getVolumeNumber()));
+ detl = new ReviewDetl();
+ if (wrkDetlLogs != null && !wrkDetlLogs.isEmpty() && wrkDetlLogs.size() >= 1) {
+ detl.setSpecs(wrkDetlLogs.get(0).getSpecs());
+ detl.setBatch(wrkDetlLogs.get(0).getBatch());
+ detl.setAnfme(wrkDetlLogs.get(0).getAnfme());
+ detl.setMatnr(wrkDetlLogs.get(0).getMatnr());
+ detl.setMaktx(wrkDetlLogs.get(0).getMaktx());
+ detl.setUnit(wrkDetlLogs.get(0).getUnit());
+ detl.setDeadTime(wrkDetlLogs.get(0).getModiTime$());
+ }
+ detl.setOrderId(review.getId());
+ detl.setOrderNo(param.getGroupOrderNumber());
+ detl.setCreateTime(new Date());
+ detl.setBrand(pg.getPackageGroupNo()); // 鍖呰缁勫彿
+ detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
+ reviewDetlService.insert(detl);
+ }
+ }
+ return R.ok("缁勮揣纭鎴愬姛");
+ }
+
+
+ @Override
+ @Transactional
public R returnOrder(ReturnOrderConfirmParam param) {
if (Cools.isEmpty(param.getOrderNumber())) {
param.setOrderNumber("THCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
@@ -2496,7 +2571,12 @@
throw new RuntimeException("璇ュ崟鎹殑鍗峰彿宸插瓨鍦�," + vn.getVolumeNumber());
}
}
-
+ List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
+ for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
+ if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
+ locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
+ }
+ }
return R.ok("缁勮揣纭鎴愬姛");
}
--
Gitblit v1.9.1