From e760b8a8ec81b7113a01b98eb2d165dcf84fc1b2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 四月 2026 13:48:47 +0800
Subject: [PATCH] 对接接口开发
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 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 f3c60b9..bb69334 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -4,6 +4,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.emums.WKType;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenInventoryVo;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
@@ -823,7 +824,7 @@
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栫爜[闈炵┖]
DateUtils.convert(now), //鍗曟嵁鏃ユ湡
- param.getOrderType(), //璁㈠崟绫诲瀷
+ WKType.query(param.getWkType()).wkType, //鍗曟嵁绫诲瀷
null, //椤圭洰缂栧彿
null, //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
null, //璋冩嫧椤圭洰缂栧彿
@@ -854,7 +855,8 @@
9527L, //淇敼浜哄憳
now, //淇敼鏃堕棿
param.getStationId(), //鍏�/鍑哄簱鎺ラ┏绔欑偣
- param.getOperateType() // 鎿嶄綔绫诲瀷 1.鏂板 2.淇敼 3.鍙栨秷
+ param.getOperateType(), // 鎿嶄綔绫诲瀷 1.鏂板 2.淇敼 3.鍙栨秷
+ param.getOrderType() // 璁㈠崟绫诲瀷 1 鍑哄簱鍗� 2 鍏ュ簱鍗� 3 璋冩嫧鍗�
);
if (!orderService.insert(order)){
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触,璇疯仈绯荤鐞嗗憳锛�"+order);
@@ -925,30 +927,5 @@
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触,璇疯仈绯荤鐞嗗憳锛�"+orderDetl);
}
}
- }
-
- @Override
- public OpenInventoryVo queryInventoryDetails(OpenInventoryParam param) {
- List<LocDetl> locDetlList = locDetlService.queryInventoryDetails(param.getLocId(), param.getMatNr(), param.getOrderNo(), param.getPlanNo(), param.getBatch());
- if (Cools.isEmpty(locDetlList)){
- return new OpenInventoryVo();
- }
- return new OpenInventoryVo(locDetlList);
- }
-
- @Override
- public OpenSummaryVo queryInventorySummary(OpenSummaryParam param) {
- String matNr = param.getMatNr();
- String[] split = matNr.split(",");
- List<OpenSummaryVo.OpenSummary> openSummaryList = new ArrayList<>();
- for (String s : split) {
- OpenSummaryVo.OpenSummary openSummary = new OpenSummaryVo.OpenSummary();
- Double summary = locDetlService.queryInventorySummary(param.getWareHouseId(), s);
- openSummary.setWareHouseId(param.getWareHouseId()); // 浠撳簱缂栫爜
- openSummary.setMatNr(s); // 鐗╂枡缂栫爜
- openSummary.setAnfme(summary); // 鏁伴噺
- openSummaryList.add(openSummary);
- }
- return new OpenSummaryVo(openSummaryList);
}
}
--
Gitblit v1.9.1