From ad3069112183bdf9301c0384bfdd6b795d43b56b Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 09 一月 2026 14:15:07 +0800
Subject: [PATCH] 1.新增erp对接接口
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 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..e97f2f5 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) {
@@ -527,6 +530,13 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
+ if(param.getMatDetails().get(0).getOperateType()==3){
+ Mat mat1 = matService.selectByMatnr(param.getMatDetails().get(0).getMatnr());
+ if(Cools.isEmpty(mat1)){
+ throw new CoolException("鍟嗗搧涓嶅瓨鍦ㄦ棤娉曠鐢�");
+ }
+ }
+
if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
@@ -904,6 +914,44 @@
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())
+ );
+ // 鍙嫞鎬婚噺锛氫紭鍏堝彇搴撳瓨琛紝鍚﹀垯鍙栦綔涓氭暟閲�
+ 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;
+ }
@Override
@Transactional
@@ -930,8 +978,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