From 20bd270fbecc8356a17b1b429eb97abe1a48700e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 16:43:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index f60d972..879e668 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -10,7 +10,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.InventoryCheckOrder;
+import com.zy.asrs.entity.InventoryCheckOrderDetl;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
import com.zy.asrs.service.InventoryCheckOrderService;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +28,38 @@
@Autowired
private InventoryCheckOrderService inventoryCheckOrderService;
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ @RequestMapping("/inventoryCheckOrder/StockCheck/select/barcode")
+ @ManagerAuth()
+ public R StockCheckSelectBarcode(@RequestParam String barcode) {
+ if (Cools.isEmpty(barcode)) {
+ return R.ok();
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if (Cools.isEmpty(wrkMast)) {
+ return R.error("璇ユ潯鐮佹湭鏌ヨ鍒扮洏鐐逛换鍔�");
+ }
+ ArrayList<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ InventoryCheckOrderDetl checkDetl = inventoryCheckOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
+ .eq("order_no", wrkMast.getSheetNo())
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("batch", wrkDetl.getBatch()));
+ if (Cools.isEmpty(checkDetl)) {
+ continue;
+ }
+ checkOrderDetls.add(checkDetl);
+
+ }
+ return R.ok(checkOrderDetls);
+ }
@RequestMapping("/inventoryCheckOrder/select/status/1")
@ManagerAuth()
@@ -83,8 +121,20 @@
@ManagerAuth
public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
String orderNo = inventoryCheckOrder.getOrderNo();
+ long time = new Date().getTime();
if (Cools.isEmpty(orderNo)) {
- return R.parse("鍗曟嵁缂栧彿涓嶈兘涓虹┖锛�" + orderNo);
+ switch (inventoryCheckOrder.getArea()){
+ case "鍫嗗灈鏈�":
+ orderNo = "DDJ"+time;
+ break;
+ case "鍥涘悜搴�":
+ orderNo = "SXK"+time;
+ break;
+ case "CTU":
+ orderNo = "CTU"+time;
+ break;
+ }
+ inventoryCheckOrder.setOrderNo(orderNo);
}
int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));
--
Gitblit v1.9.1