From 3c992dd950b539f03cdf64898f8bfba65c2313b8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 15:10:25 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 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 7083d97..b16528f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1163,32 +1163,71 @@
// }
/*
- * 姝ｅ父閫�搴撹嚦浜屾ゼ鍖呰
+ * 姝ｅ父閫�搴撹嚦浜屾ゼ鍖呰 鎷嗗寘瑁呮鍑哄簱
* */
@Override
@Transactional
- public R packagingAreaOrderCreate(QualityInspectionParam param) {
+ public R packagingAreaOrderCreate(OrderCargoBookingNoteParam param) {
try{
-// String[] split = param.getModel().split(",");
-// if (Cools.isEmpty(split)){
-// throw new CoolException("鍙傛暟锛氬嵎鍙� Model涓虹┖,瑙ｆ瀽澶辫触锛侊紒锛�");
-// }
- List<String[]> OutLocBoxCs = new ArrayList<>();
+
+ List<OrderOutLocBoxCsUtilParam> OutLocBoxCs = new ArrayList<>();
String orderNo = "TK" + snowflakeIdWorker.nextId();
- String cstmrName = "鏈煡";
-// for (String model:split){
- String[] outLocBox = new String[]{param.getBoxNo(),orderNo,cstmrName,param.getMemo(),"闅忔剰"};
- OutLocBoxCs.add(outLocBox);
-// }
+ for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
+ for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
+ if (Cools.isEmpty(roll.getMemo())){
+ return new R(401,"鍗峰彿"+roll.getRollNo()+"鐨勫娉ㄤ负绌猴紒");
+ }
+ OrderOutLocBoxCsUtilParam outLocBox = new OrderOutLocBoxCsUtilParam();
+ outLocBox.setBoxNo(box.getBoxNo());
+ outLocBox.setRoll(roll.getRollNo());
+ outLocBox.setMemo(roll.getMemo());
+ outLocBox.setOrderOneNo(orderNo);
+ outLocBox.setCstmrName(param.getCstmrName());
+ outLocBox.setDanger("闅忔剰");
+ OutLocBoxCs.add(outLocBox);
+ }
+ }
if (!OutLocBoxCs.isEmpty()){
- OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,cstmrName,"","MES涓嬪彂閫�璐ц嚦浜屾ゼ","閫�璐ц嚦浜屾ゼ",false);
+ OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES涓嬪彂鎷嗗寘瑁呮鍑哄簱","鎷嗗寘瑁呮鍑哄簱",false);
return orderOutBatchUtil.setOrderOutBatch(OutLocBoxCs);
}
} catch (Exception e) {
- throw new CoolException("瀵瑰簲绠卞彿锛�"+param.getBoxNo()+"鐨勭墿鏂欓��搴撹嚦2妤煎け璐�"+e.getMessage());
+ throw new CoolException("鎷嗗寘瑁呮鍑哄簱閫�搴撹嚦2妤煎け璐�"+e.getMessage());
}
- return R.error("瀵瑰簲绠卞彿锛�"+param.getBoxNo()+"鐨勭墿鏂欓��搴撹嚦2妤煎け璐�");
+ return R.error("鎷嗗寘瑁呮鍑哄簱閫�搴撹嚦2妤煎け璐�");
+ }
+
+ /*
+ * 璁″垝缁勮揣鍗�
+ * */
+ @Override
+ @Transactional
+ public R cargoBookingNote(OrderCargoBookingNoteParam param) {
+ try{
+ List<OrderOutLocBoxCsUtilParam> OutLocBoxCs = new ArrayList<>();
+ String orderNo = "ZH" + snowflakeIdWorker.nextId();
+ for (OrderCargoBookingNoteParam.Box box : param.getBoxList()){
+ for (OrderCargoBookingNoteParam.Box.Roll roll : box.getRollList()){
+ OrderOutLocBoxCsUtilParam outLocBox = new OrderOutLocBoxCsUtilParam();
+ outLocBox.setBoxNo(box.getBoxNo());
+ outLocBox.setRoll(roll.getRollNo());
+ outLocBox.setMemo(roll.getMemo());
+ outLocBox.setOrderOneNo(orderNo);
+ outLocBox.setCstmrName(param.getCstmrName());
+ outLocBox.setDanger("鍚堟牸");
+ OutLocBoxCs.add(outLocBox);
+ }
+ }
+
+ if (!OutLocBoxCs.isEmpty()){
+ OrderOutBatchUtil orderOutBatchUtil = new OrderOutBatchUtil(orderNo,param.getCstmrName(),"","MES涓嬪彂璁″垝缁勮揣鍗�","璁″垝缁勮揣鍗�",false,param.getGroupGoodsNo());
+ return orderOutBatchUtil.setOrderOutBatchCargoBookingNote(OutLocBoxCs);
+ }
+ } catch (Exception e) {
+ throw new CoolException("缁勮揣鍗曞彿锛�"+param.getGroupGoodsNo()+"璁″垝缁勮揣鍗曟帴鏀跺け璐ワ紒锛侊紒"+e.getMessage());
+ }
+ return R.error("缁勮揣鍗曞彿锛�"+param.getGroupGoodsNo()+"璁″垝缁勮揣鍗曟帴鏀跺け璐ワ紒锛侊紒");
}
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1