From 515ddb9ef28b1403af9cd33fc6f3adb25643c14e Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 10 十月 2024 10:52:38 +0800
Subject: [PATCH] #gz
---
src/main/java/com/zy/asrs/controller/MobileController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 26bc198..dc8c870 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -260,11 +260,18 @@
if (Cools.isEmpty(wrkDetlLog)) {
return R.error("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
}
+ if (wrkDetlLog.getDeadTime().equals("宸茬‘璁�")) {
+ return R.error("褰撳墠浠诲姟宸茬‘璁わ紝璇烽噸缃紒");
+ }
+ wrkDetlLog.setSource(1);
+ wrkDetlLogService.update(wrkDetlLog,new EntityWrapper<WrkDetlLog>().eq("batch",wrkDetlLog.getBatch()).eq("wrk_no",wrkDetlLog.getWrkNo()));
orderNo=wrkDetlLog.getOrderNo();
}else {
if (wrkDetl.getDeadTime().equals("宸茬‘璁�")) {
return R.error("褰撳墠浠诲姟宸茬‘璁わ紝璇烽噸缃紒");
}
+ wrkDetl.setSource(1);
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()).eq("wrk_no",wrkDetl.getWrkNo()));
orderNo=wrkDetl.getOrderNo();
}
// List<Order> orders = orderService.selectorderNoL(batch);
@@ -278,8 +285,6 @@
if (!Cools.isEmpty(orderDetl.getSource()) && orderDetl.getSource()==1){
return R.error("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
}
- wrkDetl.setSource(1);
- wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()).eq("wrk_no",wrkDetl.getWrkNo()));
orderDetl.setSource(1);
orderDetlService.updateById(orderDetl);
return R.ok();
--
Gitblit v1.9.1