From c9686962d78c018a89c5be7023b4ef74960e5d5b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期六, 03 四月 2021 14:54:54 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
index e432541..cc83ab4 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -7,9 +7,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.service.erp.entity.UploadBill;
import zy.cloud.wms.common.service.erp.entity.UploadBillDetail;
-import zy.cloud.wms.manager.entity.Comb;
import zy.cloud.wms.manager.utils.HttpHandler;
import java.util.ArrayList;
@@ -29,32 +29,37 @@
/**
* 鍗曟嵁涓婃姤
*/
- public Boolean uploadBill(List<Comb> combs, Integer docId, String docNumber){
+ public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
+ if (true) {
+// return true;
+ }
try {
- if (Cools.isEmpty(combs)) {
+ if (Cools.isEmpty(dtos)) {
return false;
}
UploadBill uploadBill = new UploadBill();
uploadBill.setNumber(docNumber);
uploadBill.setBillDate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
- uploadBill.setBTypeID("瀹忔尯瀹㈡埛");
+ uploadBill.setBTypeID("SHHT");
uploadBill.setKTypeID("瀹忔尯浠撳簱");
uploadBill.setVchType(docId);
List<UploadBillDetail> detail = new ArrayList<>();
uploadBill.setDetail(detail);
- for (Comb comb : combs) {
+ for (BillDto dto : dtos) {
UploadBillDetail detl = new UploadBillDetail();
- detl.setUserCode(comb.getMatnr());
- detl.setQty(comb.getAnfme());
- detl.setPrice(0.0D);
+ detl.setUserCode(dto.getMatnr());
+ detl.setQty(dto.getQty());
+ detl.setPrice(0);
+ detail.add(detl);
}
-
+ System.out.println(JSON.toJSONString(uploadBill));
String response = new HttpHandler.Builder()
.setUri(ErpScheduler.URI)
.setPath(ErpScheduler.UPLOAD_BILL)
.setJson(JSON.toJSONString(uploadBill))
.build()
.doPost();
+
if (!Cools.isEmpty(response)) {
log.warn(response);
Result result = JSON.parseObject(response, Result.class);
--
Gitblit v1.9.1