From a3a66aa959151e91f57be097b83f2a2715b502f5 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 31 三月 2025 13:11:36 +0800
Subject: [PATCH] 定时任务增加同步锁
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 37969e5..fc60578 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1436,7 +1436,7 @@
@Override
public R pdaFxprk(GwmsGenerateInventoryDto param, Long userId) {
- if (Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param,param.getMatList())) {
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛�" + param);
}
if (Cools.isEmpty(param.getBarcode())) {
@@ -1468,6 +1468,7 @@
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
+ wrkMast.setWhsType(1); // 杩斾慨鍏ュ簱鏍囪瘑
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細璁惧涓婅蛋
wrkMast.setIoType(iotype); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
@@ -1551,7 +1552,7 @@
pushFxrkToMes(param);
// 杩斿洖GWCS鐩爣淇℃伅
- openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "浜屾ゼ杩斾慨鍏ュ簱鎺ㄩ�乬wcs");
+ openServiceImpl.pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(), param.getBarcode(), "涓�妤艰繑淇叆搴撴帹閫乬wcs");
return R.ok("鍙嶄慨鍏ュ簱鎴愬姛");
}
@@ -1817,6 +1818,27 @@
return R.ok("璋冩暣鎴愬姛");
}
+ @Override
+ public R pdaFhhd(PdaDhhdParam param, Long userId) {
+
+ String orderNo = param.getOrderNo();
+
+ Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ return R.parse("鍗曟嵁缂栧彿涓嶅瓨鍦細" + orderNo);
+ } else if (!order.getSettle().equals(4L)) {
+ return R.parse("鍗曟嵁鐘舵�佷笉涓�4.宸插畬鎴�");
+ }
+
+ order.setSettle(5L);
+ order.setUpdateBy(userId);
+ order.setUpdateTime(new Date());
+
+ orderService.updateById(order);
+
+ return R.ok("鍙戣揣鏍稿鎴愬姛");
+ }
+
// 鍚屾鐩樼偣寮傚父璋冩暣缁撴灉缁檓es
void kctzPushMes(JSONObject jsonObject) {
// 鎺ュ彛璇锋眰缁撴灉
--
Gitblit v1.9.1