From bcd71f6371fa870c7647857a71bf67d21cde47e8 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 29 九月 2023 08:31:47 +0800
Subject: [PATCH] 库存更新修改
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4 ++--
src/main/java/com/zy/asrs/controller/OpenController.java | 4 ++--
src/main/resources/mapper/WrkMastMapper.xml | 10 +++++-----
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/service/OpenService.java | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8228a63..cae3801 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -306,7 +306,7 @@
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param);
+ openService.syncOrder(param,true);
return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛");
@@ -323,7 +323,7 @@
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param);
+ openService.syncOrder(param,false);
return R.ok("鍑哄簱鍗曟嵁鎺ュ彈鎴愬姛");
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 20f93db..23d0c70 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -71,7 +71,7 @@
* 鐢熸垚鍑哄叆搴撳崟鎹�
* @param param
*/
- boolean syncOrder(Map<String, Object> param);
+ boolean syncOrder(Map<String, Object> param, boolean pakin);
/**
* 鐢熸垚鍑哄叆搴撳崟鎹�
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 9a03e7f..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());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 6438c53..55150d3 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -39,10 +39,10 @@
public ReturnT<String> start(WrkMast wrkMast) {
// 14.鍏ュ簱瀹屾垚
- if (wrkMast.getWrkSts() == 14) {
+ if (wrkMast.getWrkSts() == 9) {
return doIn(wrkMast);
// 34.鍑哄簱瀹屾垚
- } else if (wrkMast.getWrkSts() == 34) {
+ } else if (wrkMast.getWrkSts() == 29) {
return doOut(wrkMast);
}
return SUCCESS;
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 6f21148..25df390 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -66,15 +66,15 @@
</resultMap>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
- select * from asr_wrk_mast where ((wrk_sts = 14 Or wrk_sts = 34) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+ select * from asr_wrk_mast where ((wrk_sts = 9 Or wrk_sts = 29) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts=15
- or (wrk_sts=35 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=35 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=35 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ where wrk_sts=10
+ or (wrk_sts=30 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=30 and dateadd(mi,10,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=30 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1