From 0406c675e143bbb08284fd55381261afcc587afc Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 15:51:36 +0800
Subject: [PATCH] 月结增加明细
---
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index 62d7fbf..7cb34f7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -12,7 +12,6 @@
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
-import com.zy.common.properties.CrossDockProperties;
import com.zy.common.web.BaseController;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,8 +46,6 @@
private ClientService clientService;
@Autowired
private CrossDockService crossDockService;
- @Autowired
- private CrossDockProperties crossDockProperties;
@RequestMapping(value = "/order/list/pda/page/auth")
@ManagerAuth
@@ -212,8 +209,8 @@
}
}
- // 瓒婂簱鍔熻兘锛氬鏋滄槸瓒婂簱鍏ュ簱鍗曪紝璋冪敤瓒婂簱鏈嶅姟澶勭悊
- if (param.getDocType() != null && param.getDocType().equals(crossDockProperties.getInboundDocTypeId())) {
+ // 瓒婂簱鍔熻兘锛氬鏋滃嬀閫変簡瓒婂簱璁㈠崟锛屾棤璁轰粈涔堢被鍨嬬殑璁㈠崟閮芥寜鐓ц秺搴撻�昏緫澶勭悊
+ if (Boolean.TRUE.equals(param.getIsCrossDock())) {
String outOrderNo = crossDockService.processCrossDockInbound(order, param, getUserId());
return R.ok("瓒婂簱鍏ュ簱鍗曞垱寤烘垚鍔燂紝宸茶嚜鍔ㄧ敓鎴愯秺搴撳嚭搴撳崟锛�" + outOrderNo);
}
--
Gitblit v1.9.1