From 12067f657bc3dc169a7a466e433374368e8daf73 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 16:14:27 +0800
Subject: [PATCH] 越库订单逻辑调整
---
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index e136ea0..eb1f397 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +21,7 @@
import java.util.*;
+@Slf4j
@RestController
@RequestMapping("order/pakin")
public class OrderPakinController extends BaseController {
@@ -42,6 +44,29 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private ClientService clientService;
+ @Autowired
+ private CrossDockService crossDockService;
+
+ @RequestMapping(value = "/order/list/pda/page/auth")
+ @ManagerAuth
+ public R pdaPageList(@RequestParam(required = true)Long tagId,
+ @RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit){
+ List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+ ArrayList<Integer> arrayList = new ArrayList<>();
+ docTypes.forEach(docType -> {
+ arrayList.add(docType.getDocId().intValue());
+ });
+ EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
+// wrapper.eq("tag_id", tagId);
+ wrapper.in("doc_type", arrayList);
+ wrapper.in("settle",1,2);
+ wrapper.orderBy("create_time", false);
+ Page<OrderPakin> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok().add(orderPage);
+ }
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -112,19 +137,23 @@
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
+ Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
+ if (null == client){
+ return R.error("瀹㈡埛涓嶅瓨鍦�");
+ }
Date now = new Date();
order = new OrderPakin(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getOrderTime(), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ client.getCode(), // 瀹㈡埛缂栧彿
+ client.getName(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -181,6 +210,29 @@
}
}
}
+
+ // 瓒婂簱鍔熻兘锛氬鏋滃嬀閫変簡瓒婂簱璁㈠崟锛屾棤璁轰粈涔堢被鍨嬬殑璁㈠崟閮芥寜鐓ц秺搴撻�昏緫澶勭悊
+ Boolean isCrossDock = param.getIsCrossDock();
+ log.info("妫�鏌ヨ秺搴撹鍗曟爣璇嗭紝isCrossDock锛歿}锛岀被鍨嬶細{}锛岃鍗曞彿锛歿}",
+ isCrossDock, isCrossDock != null ? isCrossDock.getClass().getName() : "null", order.getOrderNo());
+
+ // 鍒ゆ柇鏄惁涓鸿秺搴撹鍗曪紙鏀寔 Boolean.TRUE 鎴� true 瀛楃涓诧級
+ boolean shouldProcessCrossDock = Boolean.TRUE.equals(isCrossDock) ||
+ (isCrossDock != null && isCrossDock.toString().equalsIgnoreCase("true"));
+
+ if (shouldProcessCrossDock) {
+ log.info("寮�濮嬪鐞嗚秺搴撹鍗曪紝璁㈠崟鍙凤細{}锛岃鍗旾D锛歿}", order.getOrderNo(), order.getId());
+ String outOrderNo = crossDockService.processCrossDockInbound(order, param, getUserId());
+ // 閲嶆柊鏌ヨ璁㈠崟锛岀‘淇濈姸鎬佸凡鏇存柊
+ OrderPakin finalOrder = orderService.selectById(order.getId());
+ if (finalOrder != null) {
+ log.info("瓒婂簱璁㈠崟澶勭悊瀹屾垚锛岃鍗曞彿锛歿}锛屾渶缁堢姸鎬侊細{}", finalOrder.getOrderNo(), finalOrder.getSettle());
+ }
+ return R.ok("瓒婂簱鍏ュ簱鍗曞垱寤烘垚鍔燂紝宸茶嚜鍔ㄧ敓鎴愯秺搴撳嚭搴撳崟锛�" + outOrderNo);
+ } else {
+ log.info("闈炶秺搴撹鍗曪紝璁㈠崟鍙凤細{}锛岀姸鎬佷繚鎸佷负锛歿}", order.getOrderNo(), order.getSettle());
+ }
+
return R.ok("璁㈠崟娣诲姞鎴愬姛");
}
@@ -194,14 +246,23 @@
}
Date now = new Date();
Long userId = getUserId();
+ Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
+ if (null == client){
+ return R.error("瀹㈡埛涓嶅瓨鍦�");
+ }
+ order.setCstmr(client.getCode());
+ order.setCstmrName(client.getName());
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
+ if (!param.getDocType().equals(order.getDocType()) || !param.getOrderTime().equals(order.getOrderTime())) {
+
order.setDocType(param.getDocType());
- order.setUpdateBy(userId);
- order.setUpdateTime(now);
- if (!orderService.updateById(order)) {
- throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
- }
+ order.setOrderTime(param.getOrderTime());
+
+ }
+ order.setUpdateBy(userId);
+ order.setUpdateTime(now);
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
// 淇敼鏄庣粏妗�
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
@@ -310,7 +371,7 @@
.add("list", wrkTraceVos)
.add("orderNo", order.getOrderNo())
.add("totalQty", totalQty)
- .add("wrkQty", wrkQty + endQty)
+ .add("wrkQty", wrkQty)
.add("lackQty", lackQty)
.add("endQty", endQty)
);
--
Gitblit v1.9.1