From 96b3548131415a2a036d1514a9a0d046f3facdb5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 四月 2021 13:13:30 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 53 -----------------------------------------------------
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 7 +++++++
2 files changed, 7 insertions(+), 53 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 efeef38..4f829bc 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
@@ -638,57 +638,4 @@
}
- /**
- * 涓婁紶閿�鍞鍗曞彇娑堢粨鏋�
- */
- @Scheduled(cron = "0/5 * * * * ? ")
- @Transactional
-// @PostConstruct
- public void uploadCancelOrdersExecute(){
-// try {
-// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 3).isNotNull("number"));
-// if (Cools.isEmpty(orders)) {
-// return;
-// }
-// Map<String, Object> json = new HashMap<>();
-// List<UploadCancelResult> list = new ArrayList<>();
-// for (CustOrder custOrder : custOrders) {
-// UploadCancelResult result = new UploadCancelResult();
-// result.setNumber(custOrder.getNumber());
-// result.setUserCode(custOrder.getUserCode());
-// result.setQty(custOrder.getTotal());
-// result.setStatus(1);
-// list.add(result);
-// }
-// json.put("data", list);
-// String response = new HttpHandler.Builder()
-// .setUri(URI)
-// .setPath(UPLOAD_CANCEL_RESULT)
-// .setJson(JSON.toJSONString(json))
-// .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;
-// }
-// for (UploadCancelResult result1 : list) {
-// // 杞巻鍙叉。
-// int save = custOrderMapper.saveLog(result1.getNumber(), result1.getUserCode());
-// if (save > 0) {
-// if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", result1.getNumber()).eq("user_code", result1.getUserCode())) == 0) {
-// throw new CoolException("鍒犻櫎閿�鍞鍗曞け璐�");
-// }
-// }
-// }
-// }
-// } catch (IOException e) {
-// e.printStackTrace();
-// throw new RuntimeException(e.getMessage());
-// }
-
- }
-
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index fb26290..abd9346 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -239,6 +239,13 @@
if (Cools.isEmpty(orderDetls)) {
return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
}
+ for (OrderDetl orderDetl : orderDetls) {
+ try {
+ Integer.parseInt(String.valueOf(orderDetl.getAnfme()));
+ } catch (Exception e) {
+ return R.error(orderDetl.getMaktx() + "鏁伴噺蹇呴』涓烘暣鏁�");
+ }
+ }
OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
mainService.stockOutProcess(dto);
--
Gitblit v1.9.1