From af73582c1bd3c20e2e805d4df56c111073d3fd6f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 13:02:35 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/common/service/erp/ErpService.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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..aadd904 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,9 +29,9 @@
     /**
      * 鍗曟嵁涓婃姤
      */
-    public Boolean uploadBill(List<Comb> combs, Integer docId, String docNumber){
+    public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
         try {
-            if (Cools.isEmpty(combs)) {
+            if (Cools.isEmpty(dtos)) {
                 return false;
             }
             UploadBill uploadBill = new UploadBill();
@@ -42,19 +42,21 @@
             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.setUserCode(dto.getMatnr());
+                detl.setQty(dto.getQty());
                 detl.setPrice(0.0D);
+                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