From f193fdd84d868624bc53cb0da4425d258153afaf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 16 七月 2025 15:41:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 1bac075..c4e3732 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -35,6 +35,8 @@
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
+ private WrkDetlLogService wrkDetlLogService;
+ @Autowired
private WaitPakinService waitPakinService;
@Autowired
private LocDetlService locDetlService;
@@ -445,4 +447,58 @@
return R.ok();
}
+ @GetMapping("/order/logTransferDBDD/{orderNo}")
+ @Transactional
+ public R logTransferDBDD(@PathVariable("orderNo") String orderNo) {
+ Order orderSou = orderService.selectByNo(orderNo);
+ if (!orderSou.getSettle().equals(2L)) {
+ return R.error("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", orderNo))) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + orderNo + "銆戞槑缁嗗け璐�");
+ }
+ List<WrkDetlLog> wrkDetls = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
+ .eq("order_no", orderNo));
+ for (WrkDetlLog wrkDetlLog : wrkDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlLog);
+
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(wrkDetl);
+ orderDetl.setQty(wrkDetl.getAnfme());
+ orderDetl.setOrderId(orderSou.getId());
+ orderDetl.setOrderNo(orderSou.getOrderNo());
+ orderDetl.setStatus(1);
+ orderDetl.setCreateTime(orderSou.getCreateTime());
+ orderDetl.setCreateBy(orderSou.getCreateBy());
+ orderDetl.setUpdateTime(orderSou.getUpdateTime());
+ orderDetl.setUpdateBy(orderSou.getUpdateBy());
+ orderDetl.setId(null);
+ //鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
+ for (OrderDetl xxx : old) {
+ if (xxx.beSimilar(wrkDetl)) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
+ if (Cools.isEmpty(orderDetl.getRemark())) {
+ for (OrderDetl xxx : old) {
+ if (xxx.beSimilarByWrkDetl(wrkDetl)) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
+ }
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + orderNo + "銆戞槑缁嗗け璐�");
+ }
+ }
+
+ // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
+ if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1