From 48a341f0b97479b449cbac9f53faf56f08a5c7cc Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 09 七月 2025 16:48:39 +0800
Subject: [PATCH] 完善erp对接
---
src/main/java/com/zy/asrs/entity/param/CheckResult.java | 2 +-
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 6 +++++-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3 ++-
src/main/java/com/zy/common/model/DetlDto.java | 8 ++++++--
src/main/java/com/zy/asrs/controller/OpenMesController.java | 20 +++++++++-----------
5 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenMesController.java b/src/main/java/com/zy/asrs/controller/OpenMesController.java
index 07100c4..f629b01 100644
--- a/src/main/java/com/zy/asrs/controller/OpenMesController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenMesController.java
@@ -2,15 +2,13 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.InventoryCheckOrder;
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
@@ -46,7 +44,7 @@
private WorkService workService;
@Autowired
- private WrkMastService wrkMastService;
+ private LocMastService locMastService;
@Autowired
private InventoryCheckOrderService inventoryCheckOrderService;
@@ -77,15 +75,15 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (Cools.isEmpty(wrkMast)) {
- return R.error("鏃犳硶閫氳繃鎵樼洏鐮佹壘鍒拌宸ヤ綔妗�,璇锋鏌ユ墭鐩樼爜鏄惁姝ｇ‘");
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", param.getPalletBarcode()));
+ if (locMast == null) {
+ throw new CoolException("璇ユ墭鐩樹笉瀛樺湪搴撲腑");
}
LocDetlAdjustParam adjustParam = new LocDetlAdjustParam();
- adjustParam.setLocNo(wrkMast.getWrkSts() < 100 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo());
+ adjustParam.setLocNo(locMast.getLocNo());
List<LocDetlAdjustParam.LocDetlAdjust> list = new ArrayList<>();
param.getDetails().forEach(elem -> {
- list.add(new LocDetlAdjustParam.LocDetlAdjust(elem.getMatnr(), elem.getBatch(), elem.getActulQty(), elem.getDanger()));
+ list.add(new LocDetlAdjustParam.LocDetlAdjust(elem.getProductionCode(), elem.getBatch(), elem.getActulQty(), elem.getQuality(),elem.getCode()));
});
workService.adjustLocDetl(adjustParam, getUserId());
return R.ok();
@@ -178,7 +176,7 @@
checkOrder.setStatus("1");
param.getDetails().forEach(elem -> {
Mat mat = matService.selectByMatnr(elem.getProductionCode());
- if (mat==null){
+ if (mat == null) {
throw new CoolException("鐗╂枡涓嶅瓨鍦�");
}
//checkOrder.setArea(param.getArea());
diff --git a/src/main/java/com/zy/asrs/entity/param/CheckResult.java b/src/main/java/com/zy/asrs/entity/param/CheckResult.java
index 840c351..d5d9740 100644
--- a/src/main/java/com/zy/asrs/entity/param/CheckResult.java
+++ b/src/main/java/com/zy/asrs/entity/param/CheckResult.java
@@ -8,7 +8,7 @@
@Data
public class CheckResult implements Serializable {
- private String barcode;
+ private String palletBarcode;
private List<DetlDto> details;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index eff8c87..696f53a 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -30,6 +30,9 @@
// 鍙樻洿鏁伴噺
private Double count;
+ // 搴忓垪鐮�
+ private String threeCode;
+
private Integer danger;
public LocDetlAdjust(String matnr, String batch, Double count) {
@@ -37,11 +40,12 @@
this.batch = batch;
this.count = count;
}
- public LocDetlAdjust(String matnr, String batch, Double count,Integer danger ) {
+ public LocDetlAdjust(String matnr, String batch, Double count,Integer danger ,String threeCode ) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
this.danger = danger;
+ this.threeCode = threeCode;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 6b3d16b..d7a658f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1300,7 +1300,8 @@
Mat mat = matService.selectByMatnr(adjust.getMatnr());
LocDetl locDetl = new LocDetl();
locDetl.sync(mat);
- locDetl.setBatch(adjust.getBatch());
+ locDetl.setDanger(adjust.getDanger());
+ locDetl.setSku(adjust.getBatch());
locDetl.setLocNo(locMast.getLocNo());
locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d04cdc5..43bfe0c 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -30,6 +30,9 @@
private Double actulQty;
private Integer danger;
private Integer quality;
+ private String batchNum;
+ private String code;
+ private String productionCode;
public DetlDto() {
}
@@ -115,11 +118,12 @@
}
return null;
}
- public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String threeCode) {
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String threeCode) {
if (Cools.isEmpty(matnr)) {
return null;
}
- if (Cools.isEmpty(threeCode)){
+ if (Cools.isEmpty(threeCode)) {
return null;
}
for (DetlDto detlDto : detlDtos) {
--
Gitblit v1.9.1