From cbaed669c30a98f350857ba2d60c8ef7de012955 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 16:42:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenMesController.java | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenMesController.java b/src/main/java/com/zy/asrs/controller/OpenMesController.java
index 03c083c..07100c4 100644
--- a/src/main/java/com/zy/asrs/controller/OpenMesController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenMesController.java
@@ -9,6 +9,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.InventoryCheckOrder;
import com.zy.asrs.entity.InventoryCheckOrderDetl;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
@@ -39,7 +40,10 @@
private OpenService openService;
@Autowired
- private ManLocDetlService manLocDetlService;
+ private MatService matService;
+
+ @Autowired
+ private WorkService workService;
@Autowired
private WrkMastService wrkMastService;
@@ -83,7 +87,7 @@
param.getDetails().forEach(elem -> {
list.add(new LocDetlAdjustParam.LocDetlAdjust(elem.getMatnr(), elem.getBatch(), elem.getActulQty(), elem.getDanger()));
});
- manLocDetlService.adjustLocDetl2(adjustParam, getUserId());
+ workService.adjustLocDetl(adjustParam, getUserId());
return R.ok();
}
@@ -161,22 +165,7 @@
@RequestBody CheckOrderParam param,
HttpServletRequest request) {
auth(appkey, param, request);
- String orderNo = param.getOrderNo();
- long time = new Date().getTime();
- if (Cools.isEmpty(orderNo)) {
- switch (param.getArea()) {
- case "鍫嗗灈鏈�":
- orderNo = "DDJ" + time;
- break;
- case "鍥涘悜搴�":
- orderNo = "SXK" + time;
- break;
- case "CTU":
- orderNo = "CTU" + time;
- break;
- }
- param.setOrderNo(orderNo);
- }
+ String orderNo = param.getInventoryCode();
int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));
if (count > 0) {
@@ -184,14 +173,20 @@
}
InventoryCheckOrder checkOrder = new InventoryCheckOrder();
checkOrder.setOrderNo(orderNo);
- checkOrder.setCreateBy(getUserId().toString());
+ //checkOrder.setCreateBy(getUserId().toString());
checkOrder.setCreateTime(new Date());
checkOrder.setStatus("1");
param.getDetails().forEach(elem -> {
- checkOrder.setArea(param.getArea());
+ Mat mat = matService.selectByMatnr(elem.getProductionCode());
+ if (mat==null){
+ throw new CoolException("鐗╂枡涓嶅瓨鍦�");
+ }
+ //checkOrder.setArea(param.getArea());
InventoryCheckOrderDetl detail = new InventoryCheckOrderDetl();
- detail.setMatnr(elem.getMatnr());
- detail.setBatch(elem.getBatch());
+ detail.setMatnr(elem.getProductionCode());
+ detail.setOrderNo(orderNo);
+ detail.setMaktx(mat.getMaktx());
+ //detail.setBatch(elem.getBatch());
inventoryCheckOrderDetlService.insert(detail);
});
inventoryCheckOrderService.insert(checkOrder);
@@ -204,9 +199,9 @@
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
-// if (!auth) {
-// return;
-// }
+ if (!auth) {
+ return;
+ }
// if (Cools.isEmpty(appkey)) {
// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
// }
--
Gitblit v1.9.1