From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index edfb2a5..c71cc64 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -12,6 +12,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.FrozenParam;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.entity.Mat;
@@ -252,6 +253,26 @@
return R.ok();
}
+ @PostMapping(value = "/locDetl/frozenInventory")
+ @ManagerAuth(memo = "搴撳瓨鍐荤粨")
+ public R frozen(@RequestBody List<FrozenParam> param){
+ if (param.size() == 0) {
+ return R.parse("鏈敹鍒版暟鎹�");
+ }
+
+ return locDetlService.frozenInventory(param);
+ }
+
+ @PostMapping(value = "/locDetl/unfreezeInventory")
+ @ManagerAuth(memo = "搴撳瓨瑙ｅ喕")
+ public R unfreeze(@RequestBody List<FrozenParam> param){
+ if (param.size() == 0) {
+ return R.parse("鏈敹鍒版暟鎹�");
+ }
+
+ return locDetlService.unfreezeInventory(param);
+ }
+
@RequestMapping(value = "/locDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
public R export(@RequestBody JSONObject param){
@@ -275,26 +296,36 @@
.where("loc_no like '" + row + "%'");
}
List<LocDetl> list = locDetlService.selectList(wrapper);
- List<AbnormalLocDetlParam> result = new ArrayList<>();
+ List<LocDetl> result = new ArrayList<>();
Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(toPage(1, 10000, param, LocDetl.class));
- for (LocDetl locDetl : groupLocDetl.getRecords()) {
- AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
- Mat mat = matService.selectOne(new EntityWrapper<Mat>()
- .eq("matnr", locDetl.getMatnr()));
- if (Cools.isEmpty(mat)) {
- continue;
- }
- if (!Cools.isEmpty(mat .getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
- abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
- abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
- abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
- abnormalLocDetlParam.setAnfme(locDetl.getAnfme());
- abnormalLocDetlParam.setMaktx(mat.getMaktx());
- abnormalLocDetlParam.setMatnr(mat.getMatnr());
- abnormalLocDetlParam.setSpecs(mat.getSpecs());
- abnormalLocDetlParam.setBatch(locDetl.getBatch());
-
+// for (LocDetl locDetl : groupLocDetl.getRecords()) {
+ for (LocDetl locDetl : list) {
+// AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
+// Mat mat = matService.selectOne(new EntityWrapper<Mat>()
+// .eq("matnr", locDetl.getMatnr()));
+// if (Cools.isEmpty(mat)) {
+// continue;
+// }
+// if (!Cools.isEmpty(mat.getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
+// abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
+// abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
+// abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
+// abnormalLocDetlParam.setAnfme(locDetl.getAnfme());//鏁伴噺
+// abnormalLocDetlParam.setMaktx(mat.getMaktx());//鍟嗗搧鍚嶇О
+// abnormalLocDetlParam.setMatnr(mat.getMatnr());//鍟嗗搧缂栧彿
+// abnormalLocDetlParam.setSpecs(mat.getSpecs());
+// abnormalLocDetlParam.setBatch(locDetl.getBatch());
+// abnormalLocDetlParam.setLocNo(locDetl.getLocNo());//搴撲綅鍙�
+// abnormalLocDetlParam.setZpallet(locDetl.getZpallet());//鎵樼洏鏉＄爜
+// abnormalLocDetlParam.setBarcode(locDetl.getStandby2());//鏉＄爜upc
+// abnormalLocDetlParam.setUnit(locDetl.getStandby1());//瀹㈡埛po
+// abnormalLocDetlParam.setSku(locDetl.getSku());//瀹㈡埛sku
+// abnormalLocDetlParam.setSupp(locDetl.getSupp());//渚涘簲鍟�
+// abnormalLocDetlParam.setManu(locDetl.getBoxType1());//璐т富
+// abnormalLocDetlParam.setOrderNo(locDetl.getOrderNo());//閲囪喘鍗曞彿
+// abnormalLocDetlParam.setMemo(locDetl.getMemo());//澶囨敞
+// abnormalLocDetlParam.setModiTime(locDetl.getModiTime());//淇敼鏃堕棿
// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
// Date maxDate = simple.parse(locDetl.getBatch());
// long time = maxDate.getTime();
@@ -302,12 +333,12 @@
// long time1 = now.getTime();
// abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
- if (!Cools.isEmpty(mat.getStoreMax()) && locDetl.getAnfme() > mat.getStoreMax()) {
- result.add(abnormalLocDetlParam);
- } else if (!Cools.isEmpty(mat.getStoreMin()) && locDetl.getAnfme() < mat.getStoreMin()) {
- result.add(abnormalLocDetlParam);
- }
- }
+// if (!Cools.isEmpty(mat.getStoreMax()) && locDetl.getAnfme() > mat.getStoreMax()) {
+ result.add(locDetl);
+// } else if (!Cools.isEmpty(mat.getStoreMin()) && locDetl.getAnfme() < mat.getStoreMin()) {
+// result.add(abnormalLocDetlParam);
+// }
+// }
}
return R.ok(exportSupport(result, fields));
}
--
Gitblit v1.9.1