From 29632eff966d228531e89473d83cdc0bad2c4d33 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 09 十二月 2024 16:07:22 +0800
Subject: [PATCH] 优化订单更新逻辑及库位类型条件判断
---
src/main/resources/mapper/OrderMapper.xml | 4 +++-
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 26 +++++++++++++-------------
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index f8897c0..1983bb5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -131,23 +131,23 @@
AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().eq("matnr", pick.getMatnr()).eq("three_code", pick.getThreeCode()).eq("supp_code", pick.getSuppCode()));
if (Cools.isEmpty(agvWrkDetl)) {
- AgvWrkDetl wrkDetl = new AgvWrkDetl();
+ agvWrkDetl = new AgvWrkDetl();
Mat mat = matService.selectByMatnr(pick.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(pick.getMatnr() + "鍟嗗搧涓嶅瓨鍦�");
}
- wrkDetl.sync(mat);
- wrkDetl.setWrkNo(pickParams.getWrkNo());
- wrkDetl.setOrderNo(pick.getOrderNo());
- wrkDetl.setIoTime(agvWrkMast.getIoTime());
- wrkDetl.setAnfme(pick.getCount()); // 鏁伴噺
- wrkDetl.setSuppCode(pick.getSuppCode()); // 璐ф灦鏉＄爜
- wrkDetl.setAppeUser(userId);
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setThreeCode(pick.getThreeCode());
- agvWrkDetlService.insert(wrkDetl);
+ agvWrkDetl.sync(mat);
+ agvWrkDetl.setWrkNo(pickParams.getWrkNo());
+ agvWrkDetl.setOrderNo(pick.getOrderNo());
+ agvWrkDetl.setIoTime(agvWrkMast.getIoTime());
+ agvWrkDetl.setAnfme(pick.getCount()); // 鏁伴噺
+ agvWrkDetl.setSuppCode(pick.getSuppCode()); // 璐ф灦鏉＄爜
+ agvWrkDetl.setAppeUser(userId);
+ agvWrkDetl.setAppeTime(now);
+ agvWrkDetl.setModiUser(userId);
+ agvWrkDetl.setModiTime(now);
+ agvWrkDetl.setThreeCode(pick.getThreeCode());
+ agvWrkDetlService.insert(agvWrkDetl);
} else {
Double anfme = agvWrkDetl.getAnfme() + pick.getCount();
agvWrkDetl.setIoTime(agvWrkMast.getIoTime());
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index d456053..b4caa36 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -139,9 +139,9 @@
} else {
if (pltType != null && pltType > 0) {
order.setPltType(pltType);
+ super.updateById(order);
}
//order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
- super.updateById(order);
}
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 05f4b19..afb7417 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -64,7 +64,9 @@
update man_order
set settle = #{settle}
,update_time = getdate()
- ,plt_type = #{plt}
+ <if test="plt != null">
+ ,plt_type = #{plt}
+ </if>
,in_time = #{inTime}
where 1=1
and id = #{orderId}
--
Gitblit v1.9.1