From e58e9ba5347a681cd535115c1f83e4788f39a224 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 12 九月 2025 15:09:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 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 cebb70d..a2ac7e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1246,6 +1246,10 @@
HashMap<String, Object> xx = new HashMap<>();
List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
for (GwmsGenerateInventoryDto.MatList obj : matList) {
+ int zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("brand", obj.getPackageGroupNo()));
+ if (zpalletCount2 > 0) {
+ throw new CoolException("鍖呰缁勫彿宸插瓨鍦細" + obj.getPackageGroupNo());
+ }
if (xx.get(obj.getPackageGroupNo()) != null) {
throw new CoolException("鏄庣粏涓瓨鍦�2鏉＄浉鍚岀殑鍖呰缁勫彿锛�" + obj.getPackageGroupNo());
} else {
@@ -2338,7 +2342,60 @@
}
+ @Override
+ @Transactional
+ public R returnOrder(GroupOrderConfirmParam param) {
+ // 1. 鏌ヨ鍗曟嵁鏄惁瀛樺湪
+ Order order = orderMapper.selectOrderByOrderNo(param.getGroupOrderNumber());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (order == null) {
+ // 1.1 涓嶅瓨鍦紝鏂板缓鍗曟嵁
+ order = new Order();
+ order.setOrderNo(param.getGroupOrderNumber());
+ order.setStatus(Integer.valueOf(param.getGroupStatus()));
+ order.setOrderTime(sdf.format(new Date()));
+ order.setCreateTime(new Date());
+ order.setSettle(1L);
+ order.setDocType(26L);
+ orderMapper.insert(order);
+ } else {
+ // 1.2 瀛樺湪锛屾洿鏂板崟鎹姸鎬�
+ order.setStatus(Integer.valueOf(param.getGroupStatus()));
+ orderMapper.updateById(order);
+ }
+ orderDetlMapper.delete(
+ new EntityWrapper<OrderDetl>().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
+ OrderDetl detl = orderDetlMapper.selectByOrderNoAndPkgGroupNoAndVolumeNo(
+ param.getGroupOrderNumber(), pg.getPackageGroupNo(), vn.getVolumeNumber()
+ );
+
+ if (detl == null) {
+ detl = new OrderDetl();
+ detl.setOrderId(order.getId());
+ detl.setOrderNo(param.getGroupOrderNumber());
+ detl.setCreateTime(new Date());
+ detl.setAnfme(1.0);
+ detl.setBrand(pg.getPackageGroupNo()); // 鍖呰缁勫彿
+ detl.setModel(vn.getVolumeNumber()); // 鍗峰彿
+ orderDetlMapper.insert(detl);
+ }
+ }
+
+ return R.ok("缁勮揣纭鎴愬姛");
+ }
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1