From 0e0806329f94356aac37b5c0a2ba900cc16ced44 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 16 十二月 2025 17:00:32 +0800
Subject: [PATCH] 并板出库修改任务档明细托盘码
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index b94b1fe..d62396f 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.entity.OrderParams;
@@ -10,7 +9,6 @@
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.enums.MatLocType;
-import com.zy.api.enums.MatType;
import com.zy.api.enums.OrderType;
import com.zy.api.enums.OrderWkType;
import com.zy.api.service.KopenApiService;
@@ -19,6 +17,7 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.OrderSettle;
+import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
@@ -62,6 +61,7 @@
/**
* 涓婃灦娲惧伐鍗曞弽棣�
+ *
* @author Ryan
* @date 2025/11/24 15:33
*/
@@ -95,14 +95,15 @@
}
}
- /* */
- /**
- * 澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�
- * @author Ryan
- * @date 2025/11/24 15:21
- * @param params
- * @return com.core.common.R
- */
+ /* */
+ /**
+ * 澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�
+ *
+ * @author Ryan
+ * @date 2025/11/24 15:21
+ * @param params
+ * @return com.core.common.R
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public R sendOutDispatch(PubOrderParams params) {
@@ -121,12 +122,13 @@
}
addOrUpdateOrders(params, "add");
-
+
return R.ok("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙戞垚鍔燂紒锛�");
}
/**
* 澶囪揣鎸囩ず娲惧伐鍗�
+ *
* @author Ryan
* @date 2025/12/16 9:15
* @param params
@@ -153,7 +155,8 @@
// 鍒犻櫎鏃ц鍗曟槑缁�
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
- };
+ }
+ ;
if (!orderService.deleteById(order.getId())) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
@@ -231,7 +234,14 @@
throw new CoolException("璁㈠崟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
OrderParams orderParams = JSONObject.parseObject(JSONObject.toJSONString(params), OrderParams.class);
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getInv_no()));
+ Order order = new Order();
+ if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
+ // 鍏ュ簱
+ order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getInv_no()));
+ } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
+ // 鍑哄簱
+ order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getDispatch_no()));
+ }
if (type.equals("add") && !Objects.isNull(order)) {
throw new CoolException("鍗曟嵁宸插瓨鍦�, 涓嶅彲閲嶅娣诲姞锛侊紒");
}
@@ -256,10 +266,10 @@
public static String generateUUID(OrderParams params) {
return java.util.UUID.randomUUID().toString();
}
-
/**
* 鐢熸垚璁㈠崟淇℃伅
+ *
* @param params
*/
@Transactional(rollbackFor = Exception.class)
@@ -274,7 +284,7 @@
} else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
// 鍑哄簱
newOrder.setPakinPakoutStatus(2);
- newOrder.setDocType(5L);
+ newOrder.setDocType(Long.parseLong(OrderTypeEnum.TRANSFER.type + ""));
newOrder.setOrderNo(params.getDispatch_no());
}
newOrder.setUuid(generateUUID(params));
@@ -321,7 +331,7 @@
orderItem.setBrand(matnr.getBrand());
orderItem.setBatch(1 + "");
orderItem.setStandby1(item.getPro_id());
- //鍏宠仈涓婂姞娲惧伐鍗曞彿+闆朵欢浠ｇ爜+渚涘簲鍟嗕唬鐮�
+ // 鍏宠仈涓婂姞娲惧伐鍗曞彿+闆朵欢浠ｇ爜+渚涘簲鍟嗕唬鐮�
orderItem.setThreeCode(item.getTotal_serial());
// 渚涘簲鍟嗕唬鐮�
orderItem.setSuppCode(item.getPro_id());
--
Gitblit v1.9.1