From b66aff64f0d6da5722dea46006e97ea646022192 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 22 四月 2021 17:22:28 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 5 +++++ src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 2 +- src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java index e4f8b0c..a379377 100644 --- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java +++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java @@ -549,7 +549,7 @@ // 澶� - getOrderResult0.setNumber(order.getOrderNo()); + getOrderResult0.setNumber(order.getUuid()); getOrderResult0.setVchType(11); // todo:luxiaotao getOrderResult0.setBillDate(order.getOrderTime()); getOrderResult0.setBTypeID(order.getTel()); 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 1f1e729..454d4d0 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 @@ -52,6 +52,11 @@ uploadBill.setBTypeID("SHHT"); uploadBill.setKTypeID("瀹忔尯浠撳簱"); uploadBill.setVchType(docId); + if (docId == 9) { + uploadBill.setDifAtype(22); + } else if (docId == 14) { + uploadBill.setDifAtype(23); + } uploadBill.setSummary(docType.getDocName() + " - " + DateUtils.convert(new Date(), "yyyy-MM-dd HH:mm")); List<UploadBillDetail> detail = new ArrayList<>(); uploadBill.setDetail(detail); diff --git a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java b/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java index b1e92cc..dce1440 100644 --- a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java +++ b/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java @@ -25,6 +25,8 @@ // 鑷 private Double Vchcode; + private Integer difAtype; + private List<UploadBillDetail> detail; } -- Gitblit v1.9.1