From 15d69d9f596a7529ce5a8b8d5a38b94e5c50b6b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 09:21:56 +0800
Subject: [PATCH] # 库存跳转上报erp
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 58 +++++++++++++++++++++++++++--
src/main/java/com/zy/common/service/wms/WmsService.java | 26 ++++++++++--
src/main/java/com/zy/common/model/ErpUpload.java | 19 +++++++++
3 files changed, 94 insertions(+), 9 deletions(-)
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 bf67288..3d08f6b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -5,6 +5,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
@@ -13,12 +14,11 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
-import com.zy.common.model.LocDetlDto;
-import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.OutLocDto;
-import com.zy.common.model.StartupDto;
+import com.zy.common.model.*;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
+import com.zy.common.service.wms.Result;
+import com.zy.common.service.wms.WmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +60,10 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private WmsService wmsService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@Override
@Transactional
@@ -542,12 +546,37 @@
adjDetl.setOriQty(0.0D);
adjDetl.setAdjQty(adjust.getCount());
adjDetlService.save(adjDetl, userId);
+ // 涓婃姤erp
+ String docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ Integer docId = 14; // 鎶ユ孩鍗�
+ List<BillDto> dtos = new ArrayList<>();
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(adjust.getMatnr());
+ billDto.setQty(Math.abs(adjust.getCount()));
+ dtos.add(billDto);
+ Result result = wmsService.erpUpload(dtos, docId, docNum);
+ if (result.getCode() != 200) {
+ throw new CoolException("搴撳瓨璋冩暣澶辫触锛屽師鍥狅細鏃犳硶涓婃姤鑷矱RP");
+ }
// 淇敼鍘熷簱瀛樻槑缁�
} else {
// 濡傛灉鏁伴噺淇敼锛屽垯鏇存柊搴撳瓨鏄庣粏
if (!adjust.getCount().equals(one.getAnfme())) {
// 褰撴暟閲忚淇敼涓� 0 鏃讹紝鐩存帴娓呴櫎搴撳瓨鏄庣粏
if (adjust.getCount() == 0) {
+ // 涓婃姤erp
+ String docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ Integer docId = 9; // 鎶ユ崯鍗�
+ List<BillDto> dtos = new ArrayList<>();
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(adjust.getMatnr());
+ billDto.setQty(Math.abs(one.getAnfme()));
+ dtos.add(billDto);
+ Result result = wmsService.erpUpload(dtos, docId, docNum);
+ if (result.getCode() != 200) {
+ throw new CoolException("搴撳瓨璋冩暣澶辫触锛屽師鍥狅細鏃犳硶涓婃姤鑷矱RP");
+ }
+ // 鍒犻櫎搴撳瓨
if (!locDetlService.delete(new EntityWrapper<>(one))) {
throw new CoolException("娓呴櫎搴撳瓨鏄庣粏澶辫触");
}
@@ -561,6 +590,27 @@
.eq("matnr", adjust.getMatnr()))) {
throw new CoolException("淇敼搴撳瓨鏄庣粏澶辫触");
}
+ // 涓婃姤erp
+ String docNum;
+ Integer docId;
+ if (one.getAnfme() > adjust.getCount()) {
+ // 鎶ユ崯
+ docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ docId = 9;
+ } else {
+ // 鎶ユ孩
+ docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ docId = 14;
+ }
+ List<BillDto> dtos = new ArrayList<>();
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(adjust.getMatnr());
+ billDto.setQty(Math.abs(one.getAnfme() - adjust.getCount()));
+ dtos.add(billDto);
+ Result result = wmsService.erpUpload(dtos, docId, docNum);
+ if (result.getCode() != 200) {
+ throw new CoolException("搴撳瓨璋冩暣澶辫触锛屽師鍥狅細鏃犳硶涓婃姤鑷矱RP");
+ }
}
// 淇濆瓨璋冩暣璁板綍
AdjDetl adjDetl = new AdjDetl();
diff --git a/src/main/java/com/zy/common/model/ErpUpload.java b/src/main/java/com/zy/common/model/ErpUpload.java
new file mode 100644
index 0000000..f0aa102
--- /dev/null
+++ b/src/main/java/com/zy/common/model/ErpUpload.java
@@ -0,0 +1,19 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2021/6/18
+ */
+@Data
+public class ErpUpload {
+
+ private List<BillDto> dtos;
+
+ private Integer docId;
+
+ private String docNumber;
+
+}
diff --git a/src/main/java/com/zy/common/service/wms/WmsService.java b/src/main/java/com/zy/common/service/wms/WmsService.java
index fa6b5b5..4a42114 100644
--- a/src/main/java/com/zy/common/service/wms/WmsService.java
+++ b/src/main/java/com/zy/common/service/wms/WmsService.java
@@ -1,6 +1,8 @@
package com.zy.common.service.wms;
import com.alibaba.fastjson.JSON;
+import com.zy.common.model.BillDto;
+import com.zy.common.model.ErpUpload;
import com.zy.common.utils.HttpHandler;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -17,11 +19,6 @@
@Value("${wms.url}")
private String wmsUrl;
-// // todo:luxiaotao
-// public Result replenish(List<ReplenishDto> dtos) {
-// return new Result(200, "鎿嶄綔鎴愬姛", null);
-// }
-
public Result replenish(List<ReplenishDto> dtos) {
try {
ReplenishParam param = new ReplenishParam();
@@ -39,4 +36,23 @@
}
}
+ public Result erpUpload(List<BillDto> dtos, Integer docId, String docNumber) {
+ try {
+ ErpUpload param = new ErpUpload();
+ param.setDtos(dtos);
+ param.setDocId(docId);
+ param.setDocNumber(docNumber);
+ String response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/open/api/erp/upload")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ return JSON.parseObject(response, Result.class);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return new Result(500, "鏈嶅姟鍣ㄥ紓甯�", null);
+ }
+ }
+
}
--
Gitblit v1.9.1