From a2613d9aaaafecf790db9a3a94f965dc5d1ba41e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 16:10:54 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/CustOrderMapper.xml | 4 ++--
src/main/java/zy/cloud/wms/manager/service/CustOrderService.java | 2 +-
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 4 ++--
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 2 +-
src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java | 4 ++--
src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java | 3 ++-
src/main/java/zy/cloud/wms/common/service/MainService.java | 11 ++++++-----
7 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 07af77b..dbc4645 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -13,10 +13,7 @@
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Pakout;
-import zy.cloud.wms.manager.service.LocDetlService;
-import zy.cloud.wms.manager.service.MatService;
-import zy.cloud.wms.manager.service.PakoutService;
-import zy.cloud.wms.manager.service.PriorService;
+import zy.cloud.wms.manager.service.*;
import java.util.Date;
import java.util.List;
@@ -36,7 +33,7 @@
@Autowired
private PakoutService pakoutService;
@Autowired
- private PriorService priorService;
+ private CustOrderService custOrderService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@@ -84,6 +81,10 @@
issued = issued - locDetl.getAnfme();
}
}
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(custOrder.getNumber(), 2)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
}
}
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 387f582..4713f39 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
@@ -69,7 +69,7 @@
data.getQty(), // 鍟嗗搧鏁伴噺
data.getPrice(), // 鍟嗗搧鍗曚环
data.getComment(), // 鍟嗗搧澶囨敞[闈炵┖]
- 1, // 鐘舵��
+ 0, // 鐘舵��
now, // 娣诲姞鏃堕棿
now, // 淇敼鏃堕棿
null // 澶囨敞
@@ -83,7 +83,7 @@
if (complete) {
List<String> collect = list.stream().map(GetDataResult::getNumber).distinct().collect(Collectors.toList());
for (String number : collect) {
- custOrderService.completeLoading(number);
+ custOrderService.updateStatus(number, 1);
}
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index dd78dc7..a5eae33 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -42,7 +42,7 @@
}
@RequestMapping("/stock/out")
- @ManagerAuth(memo = "鎷ｈ揣")
+ @ManagerAuth(memo = "鎹¤揣")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
return workService.stockOut(stockOutParam, getUserId());
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
index 91dad4e..ae3ac37 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.mapper;
+import org.apache.ibatis.annotations.Param;
import zy.cloud.wms.manager.entity.CustOrder;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -9,7 +10,7 @@
@Repository
public interface CustOrderMapper extends BaseMapper<CustOrder> {
+ int updateStatus(@Param("number") String number, @Param("status") Integer status);
- int completeLoading(String number);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java b/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
index f36758a..8710096 100644
--- a/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
@@ -5,6 +5,6 @@
public interface CustOrderService extends IService<CustOrder> {
- boolean completeLoading(String number);
+ boolean updateStatus(String number, Integer status);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
index 45a535a..d5f3d40 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
@@ -10,7 +10,7 @@
public class CustOrderServiceImpl extends ServiceImpl<CustOrderMapper, CustOrder> implements CustOrderService {
@Override
- public boolean completeLoading(String number) {
- return this.baseMapper.completeLoading(number) > 0;
+ public boolean updateStatus(String number, Integer status) {
+ return this.baseMapper.updateStatus(number, status) > 0;
}
}
diff --git a/src/main/resources/mapper/CustOrderMapper.xml b/src/main/resources/mapper/CustOrderMapper.xml
index 456da39..6f5ba91 100644
--- a/src/main/resources/mapper/CustOrderMapper.xml
+++ b/src/main/resources/mapper/CustOrderMapper.xml
@@ -19,8 +19,8 @@
</resultMap>
- <update id="completeLoading">
- update man_cust_order set status = 1 where 1=1 and number = #{number}
+ <update id="completeOrder">
+ update man_cust_order set status = #{status} where 1=1 and number = #{number}
</update>
</mapper>
--
Gitblit v1.9.1