From 7391ec15384def3cf84c7c33c9a4e3efc4498e2a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 三月 2021 16:36:12 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 2 +-
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 43 ++++++++++++++++++++++---------------------
2 files changed, 23 insertions(+), 22 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 b494ced..79d6a86 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
@@ -41,6 +41,7 @@
public static final String URI = "http://8.133.182.21:8080/api";
public static final String GET_ORDERS = "cM/basis/getOrders";
public static final String GET_BASIS = "cM/basis/getBasis";
+ public static final String UPLOAD_BILL = "cM/basis/uploadBill";
public static final String UPLOAD_STOCK = "cM/basis/uploadStock";
@Autowired
@@ -365,7 +366,7 @@
// 琛ㄥご
if (Cools.isEmpty(getOrderResult0.getNumber())) {
getOrderResult0.setNumber(number);
- getOrderResult0.setVchType(34); // todo:luxiaotao
+ getOrderResult0.setVchType(11); // todo:luxiaotao
getOrderResult0.setBillDate(custOrder.getBillDate());
getOrderResult0.setBTypeID(custOrder.getBTypeId());
getOrderResult0.setKTypeID("瀹忔尯浠撳簱");
@@ -383,28 +384,28 @@
System.out.println(JSON.toJSONString(getOrderResult0));
- int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
- if (save > 0) {
- if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
- throw new CoolException("鍒犻櫎閿�鍞鍗曞け璐�");
+
+ String response = new HttpHandler.Builder()
+ .setUri(URI)
+ .setPath(UPLOAD_BILL)
+ .setJson(JSON.toJSONString(getOrderResult0))
+ .build()
+ .doPost();
+ if (!Cools.isEmpty(response)) {
+ log.warn(response);
+ Result result = JSON.parseObject(response, Result.class);
+ if (result.getCode() != 1) {
+ return;
+ }
+ // 杞巻鍙叉。
+ int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
+ if (save > 0) {
+ if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
+ throw new CoolException("鍒犻櫎閿�鍞鍗曞け璐�");
+ }
+ log.info("{}閿�鍞鍗曟嫞璐х粨鏉�", getOrderResult0.getNumber());
}
}
-
-// String response = new HttpHandler.Builder()
-// .setUri(URI)
-// .setPath(GET_ORDERS)
-// .setJson(JSON.toJSONString(getOrderResult0))
-// .build()
-// .doPost();
-// if (!Cools.isEmpty(response)) {
-//// log.info(response);
-// Date now = new Date();
-// Result result = JSON.parseObject(response, Result.class);
-// if (result.getCode() != 1) {
-// return;
-// }
-// // 杞巻鍙叉。
-// }
}
}
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index abb0e85..d4eb38f 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -68,7 +68,7 @@
<a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px"><span style="display: none">{{d.number}}</span>鎷ｈ揣鍗�</a>
{{# } }}
{{#if (d.status == 2 || d.status == 4){ }}
- <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
+ <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px"><span style="display: none">{{d.number}}</span>鎵撳嵃</a>
{{# } }}
</script>
--
Gitblit v1.9.1