From e7d8e2c64facfa261e8b168b84e81ef6c835f57d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 09:25:19 +0800
Subject: [PATCH] 许可证到期提醒，系统30分钟无操作下线账号
---
src/main/java/com/zy/asrs/controller/MobileController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 0e0e7c6..5a3ffde 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,15 +9,15 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.license.AbstractServerInfos;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -58,6 +58,8 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
+
+ private static Logger logger = LogManager.getLogger(MobileController.class);
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -136,10 +138,13 @@
combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setDetId(orderDetl.getDetId());
+ combMat.setDetlId(orderDetl.getId());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
}
+ combParam.setBillNo(order.getOrderNo());
combParam.setOrderNo(order.getOrderNo());
combParams.add(combParam);
}
@@ -150,6 +155,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
+ logger.info("缁勬墭鍙傛暟锛歿}",combParam);
if (Cools.isEmpty(combParam.getOrderNo())) {
combParam.setOrderNo(combParam.getBillNo());
}
@@ -162,6 +168,31 @@
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/order/search/orderNoList/auth")
+ @ManagerAuth
+ public R orderSearchList(@RequestParam String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = null;
+ }
+ List<Order> orders = orderService.selectorderNoL2(orderNo);
+ if (Cools.isEmpty(orders)) {
+ return R.ok();
+ }
+ return R.ok().add(orders);
+ }
+
+ @RequestMapping("/pickIn/auth")
+// @ManagerAuth(memo="鐩樼偣鍏ュ簱")
+ public R pickIn(@RequestParam String barcode){
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ List<PickInParam> param = wrkDetlService.selectDetByBarcode(barcode);
+ for(PickInParam pickInParam : param){
+ pickInParam.setStaNo(wrkMast.getStaNo());
+ pickInParam.setWorkNo(wrkMast.getWrkNo());
+ }
+ return R.ok().add(param);
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
--
Gitblit v1.9.1