From 86b8273226c7aa87e7c346659ed9e76278dcc471 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 15 十月 2023 11:28:01 +0800
Subject: [PATCH] AGV工作档取消和完成
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index cbb903c..b9e7d99 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -691,7 +691,7 @@
}
@Transactional
- public boolean syncOrder(Map<String, Object> param) {
+ public boolean syncOrder(Map<String, Object> param, boolean pakin) {
if(Cools.isEmpty(param) || Cools.isEmpty(param.get("orderDetails"))){
throw new CoolException("鍗曟嵁鍙傛暟涓虹┖鎴栬�呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅");
}
@@ -700,7 +700,7 @@
throw new CoolException("璇ュ崟鎹凡瀛樺湪锛屾棤娉曠敓鎴愬崟鎹俊鎭�");
}
Date now = new Date();
- Order order = orderMapping(param,now);
+ Order order = orderMapping(param,now,pakin);
orderService.insert(order);
List<Map<String, Object>> orderDetails = (List<Map<String, Object>>) param.get("orderDetails");
orderDetails.forEach(odParam -> {
@@ -728,7 +728,7 @@
return true;
}
- private Order orderMapping(Map<String, Object> param, Date now){
+ private Order orderMapping(Map<String, Object> param, Date now, boolean pakin){
Order order = new Order();
//uuid
order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
@@ -742,7 +742,7 @@
//order.setDefNumber(param.get("cBusType").toString());
order.setDefNumber(toString(param.get("cBusType")));
//鍗曟嵁绫诲瀷
- DocType docType = docTypeService.selectOrAdd(param.get("cVouchType").toString(), Boolean.TRUE);
+ DocType docType = docTypeService.selectOrAdd(param.get("cVouchType").toString(), pakin);
order.setDocType(docType.getDocId());
//鍗曟嵁鏃ユ湡
//order.setOrderTime(param.get("dDate").toString());
@@ -800,13 +800,16 @@
//od.setAnfme(toString(odParam.get("iQuantity")));
//琛屽彿
//od.setBrand(odParam.get("irowno").toString());
- od.setBrand(toString(odParam.get("irowno")));
+ //od.setBrand(toString(odParam.get("irowno")));
+ od.setManu(toString(odParam.get("irowno")));
//閿�鍞鍗曞彿
//od.setColor(odParam.get("csocode").toString());
- od.setColor(toString(odParam.get("csocode")));
+ //od.setColor(toString(odParam.get("csocode")));
+ od.setThreeCode(toString(odParam.get("csocode")));
//閿�鍞鍗曡鍙�
//od.setOrigin(odParam.get("isoseq").toString());
- od.setOrigin(toString(odParam.get("isoseq")));
+ //od.setOrigin(toString(odParam.get("isoseq")));
+ od.setDeadTime(toString(odParam.get("isoseq")));
od.setStatus(1);
od.setQty(0.0D);
--
Gitblit v1.9.1