From e5cf12d2e3441b83cc3aeafd4f7f23d4075ab5fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 一月 2025 14:56:14 +0800
Subject: [PATCH] #并板出库
---
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index 7afaeab..879e668 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -1,19 +1,22 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.InventoryCheckOrder;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.InventoryCheckOrderService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+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.*;
@@ -25,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()
@@ -82,11 +117,37 @@
}
}
- @RequestMapping(value = "/inventoryCheckOrder/add/auth")
+ @PostMapping (value = "/inventoryCheckOrder/add/auth")
@ManagerAuth
- public R add(InventoryCheckOrder inventoryCheckOrder) {
+ public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
+ String orderNo = inventoryCheckOrder.getOrderNo();
+ long time = new Date().getTime();
+ if (Cools.isEmpty(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));
+ if (count > 0) {
+ return R.parse("鍗曟嵁缂栧彿宸茬粡瀛樺湪锛�" + orderNo);
+ }
+
+ inventoryCheckOrder.setCreateBy(getUserId().toString());
+ inventoryCheckOrder.setCreateTime(new Date());
+ inventoryCheckOrder.setStatus("1");
+
inventoryCheckOrderService.insert(inventoryCheckOrder);
- return R.ok();
+ return R.ok(orderNo + "鏂板鎴愬姛");
}
@RequestMapping(value = "/inventoryCheckOrder/update/auth")
--
Gitblit v1.9.1