From 4315c959d95e106ff9e18c28398087aeee7d077d Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 09 三月 2026 15:12:08 +0800
Subject: [PATCH] 对接接口开发
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 164 insertions(+), 3 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 0ae85bc..d845703 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -66,6 +66,8 @@
@Autowired
private BasArmMastService basArmMastService;
@Autowired
+ private BasAgvLocDetlService basAgvLocDetlService;
+ @Autowired
private BasArmMastSignService basArmMastSignService;
@Autowired
private BasAgvMastService basAgvMastService;
@@ -75,7 +77,8 @@
private CommonService commonService;
@Autowired
private LocMastServiceImpl locMastService;
-
+ @Autowired
+ private WrkDetlService wrkDetlService;
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
@@ -904,6 +907,164 @@
throw new CoolException("鏈兘缁戝畾");
}
}
+ @Override
+ @Transactional
+ public List<PickWrkDetlListParam> getPickList(PdaPickListParam param) {
+ List<WrkDetl> wrkDetls = wrkDetlService.findByBarcode(param.getBarcode());
+ List<PickWrkDetlListParam> result = new ArrayList<>();
+ wrkDetls.forEach(wrkDetl -> {
+ Double total;
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ LocDetl locDetl = locDetlService.selectOne(
+ wrapper.eq("zpallet", wrkDetl.getZpallet())
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("box_type3",wrkDetl.getBoxType3())
+ );
+ // 鍙嫞鎬婚噺锛氫紭鍏堝彇搴撳瓨琛紝鍚﹀垯鍙栦綔涓氭暟閲�
+ if (Cools.isEmpty(locDetl)) {
+ total = wrkDetl.getAnfme();
+ } else {
+ total = locDetl.getAnfme();
+ }
+ // ===== 缁勮杩斿洖瀵硅薄 =====
+ PickWrkDetlListParam dto = new PickWrkDetlListParam();
+ dto.setMatnr(wrkDetl.getMatnr());
+ dto.setMaknx(wrkDetl.getMaktx());
+ dto.setOrderNo(wrkDetl.getOrderNo());
+ dto.setBoxType3(wrkDetl.getBoxType3());
+ dto.setStandby1(wrkDetl.getStandby1());
+ dto.setStandby2(wrkDetl.getStandby2());
+ dto.setStandby3(wrkDetl.getStandby3());
+ dto.setManu(wrkDetl.getManu());
+ dto.setMemo(wrkDetl.getMemo());
+ // 褰撳墠鎷ｈ揣鏁伴噺
+ dto.setCount(wrkDetl.getAnfme());
+ // 鍙嫞鎬绘暟閲�
+ dto.setTotal(total);
+ result.add(dto);
+ });
+
+ return result;
+ }
+
+ /**
+ * 鍏�/鍑哄簱閫氱煡鍗曚笅鍙�
+ * @param param
+ */
+ @Override
+ public void orderCreate(OpenOrderParam param) {
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (!Cools.isEmpty(order)){
+ throw new CoolException(param.getOrderNo() + "璁㈠崟宸插瓨鍦紝璇峰嬁閲嶅鍒涘缓");
+ }
+ Date now = new Date();
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ param.getOrderNo(), // 璁㈠崟缂栫爜[闈炵┖]
+ DateUtils.convert(now), //鍗曟嵁鏃ユ湡
+ param.getOrderType(), //璁㈠崟绫诲瀷
+ null, //椤圭洰缂栧彿
+ null, //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
+ null, //璋冩嫧椤圭洰缂栧彿
+ null, //鍒濆绁ㄦ嵁鍙�
+ null, //绁ㄦ嵁鍙�
+ null, //瀹㈡埛缂栧彿
+ null, //瀹㈡埛
+ param.getOrderInternalCode(), //鍗曟嵁鍐呯爜
+ param.getWkType(), //涓氬姟绫诲瀷
+ null, //鍚堣閲戦
+ null, //浼樻儬鐜�
+ null, //浼樻儬閲戦
+ null, //閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, //瀹炰粯閲戦
+ null, //浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ null, //涓氬姟鍛�
+ null, //缁撶畻澶╂暟
+ null, //閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ null, //閭垂
+ param.getBusinessTime(), //涓氬姟鏃ユ湡
+ param.getCreateTime(), //鍒涘缓鏃ユ湡
+ null, //鐗╂祦鍚嶇О
+ null, //鐗╂祦鍗曞彿
+ 1L, //璁㈠崟鐘舵��
+ 1, //鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ 9527L, //娣诲姞浜哄憳
+ now, //娣诲姞鏃堕棿
+ 9527L, //淇敼浜哄憳
+ now, //淇敼鏃堕棿
+ param.getStationId(), //鍏�/鍑哄簱鎺ラ┏绔欑偣
+ param.getOperateType() // 鎿嶄綔绫诲瀷 1.鏂板 2.淇敼 3.鍙栨秷
+ );
+ if (!orderService.insert(order)){
+ throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触,璇疯仈绯荤鐞嗗憳锛�"+order);
+ }
+ List<OpenOrderParam.OrderItem> list = new ArrayList<>();
+ List<OpenOrderParam.OrderItem> orderItems = param.getOrderItems();
+ for (OpenOrderParam.OrderItem item : orderItems){
+ OpenOrderParam.OrderItem orderItem = new OpenOrderParam.OrderItem(
+ item.getLineId(),
+ item.getMatNr(),
+ item.getMakTx(),
+ item.getAnfme(),
+ item.getSpec(),
+ item.getModel(),
+ item.getUnit(),
+ item.getBatch(),
+ item.getPalletId(),
+ item.getPlanNo(),
+ item.getTargetWareHouseId(),
+ item.getSourceWareHouseId()
+ );
+ if (OpenOrderParam.OrderItem.hasLineNumber(list,orderItem)){
+ OpenOrderParam.OrderItem oi = OpenOrderParam.OrderItem.findLineNumber(
+ list,
+ item.getLineId(),
+ item.getMatNr(),
+ item.getMakTx(),
+ item.getAnfme(),
+ item.getSpec(),
+ item.getModel(),
+ item.getUnit(),
+ item.getBatch(),
+ item.getPalletId(),
+ item.getPlanNo(),
+ item.getTargetWareHouseId(),
+ item.getSourceWareHouseId()
+ );
+ assert oi != null;
+ oi.setAnfme(oi.getAnfme() + orderItem.getAnfme());
+ } else {
+ list.add(orderItem);
+ }
+ }
+ for (OpenOrderParam.OrderItem orderItem : list) {
+ Mat mat = matService.selectByMatnr(orderItem.getMatNr());
+ if (Cools.isEmpty(mat)){
+ throw new CoolException("璁㈠崟鏄庣粏涓殑鍟嗗搧缂栧彿涓嶅瓨鍦細" + orderItem.getMatNr());
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setOrderNo(order.getOrderNo()); // 璁㈠崟缂栧彿
+ orderDetl.setOrderId(order.getId()); // 璁㈠崟鍐呯爜
+ orderDetl.setStandby1(order.getTel()); // 琛屽唴鐮� 鍞竴鏍囪瘑
+ orderDetl.setAnfme(orderItem.getAnfme()); // 璁㈠崟鏁伴噺
+ orderDetl.setBarcode(orderItem.getBatch()); // 鎵规
+ orderDetl.setStandby2(orderItem.getPalletId()); // 鎵樼洏鐮�
+ orderDetl.setStandby3(orderItem.getPlanNo()); // 璁″垝璺熻釜鍙�
+ orderDetl.setBoxType1(orderItem.getSourceWareHouseId()); // 寤鸿鍏ュ簱浠撳簱
+ orderDetl.setBoxType2(orderItem.getTargetWareHouseId()); // 寤鸿鍑哄簱浠撳簱
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+// orderDetl.setPakinPakoutStatus(1);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触,璇疯仈绯荤鐞嗗憳锛�"+orderDetl);
+ }
+ }
+ }
@Override
@Transactional
@@ -930,8 +1091,8 @@
}
private AgvLocListDetlParam buildAgvLocListDetlParam(String locNo, String locSts) {
- List<LocDetl> detlList = locDetlService.selectList(
- new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ List<BasAgvLocDetl> detlList = basAgvLocDetlService.selectList(
+ new EntityWrapper<BasAgvLocDetl>().eq("loc_no", locNo)
);
AgvLocListDetlParam dto = new AgvLocListDetlParam();
--
Gitblit v1.9.1