From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/asrs/controller/PlaController.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index ed652b4..5e5abb6 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
@@ -11,6 +12,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
+import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.PlaExcelListener;
import com.zy.asrs.utils.SaasUtils;
@@ -67,6 +69,11 @@
wrapper.ne("status", "鍏ㄩ儴鍑哄簱");
}
+ if (!Cools.isEmpty(param.get("batch")) && param.get("batch").toString().contains(",")){
+ String[] batchs = param.get("batch").toString().split(",");
+ wrapper.in("batch",batchs);
+ param.remove("batch");
+ }
convert(param, wrapper);
wrapper.orderBy("batch",true).orderBy("package_no" ,true);
@@ -148,7 +155,11 @@
for (Pla pla : plas){
if(pla.getStockFreeze() == 0){
- throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
+// throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
+ System.out.println(pla.getStockFreezeBy() + "," + getUser().getUsername());
+ if(!Cools.eq(pla.getStockFreezeBy(),getUser().getUsername())){
+ throw new CoolException("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨");
+ }
}
allOrderWeight += pla.getOrderWeight();
@@ -229,7 +240,8 @@
}
for (Pla pla : plas){
if (pla.getStockFreeze() == 0){
- throw new CoolException("搴撳瓨宸茶鍐荤粨锛�");
+ continue;
+// throw new CoolException("搴撳瓨宸茶鍐荤粨锛�");
}
pla.setStockFreeze(0);
pla.setStockFreezeBy(getUser().getUsername());
@@ -248,7 +260,8 @@
}
for (Pla pla : plas){
if (pla.getStockFreeze() == 1){
- throw new CoolException("搴撲綅鏈喕缁擄紝鏃犻渶瑙ｅ喕");
+ continue;
+// throw new CoolException("搴撲綅鏈喕缁擄紝鏃犻渶瑙ｅ喕");
}
if(!Cools.eq(pla.getStockFreezeBy(),getUser().getUsername())){
throw new CoolException("鏃犳硶瑙ｅ喕鍏朵粬鐢ㄦ埛鍐荤粨鐨勫簱浣�");
@@ -337,6 +350,26 @@
return R.ok().add(res);
}
+ /*************************************** xm-select ***********************************************/
+
+ // xm-select 鎼滅储鎵瑰彿
+ @RequestMapping("/pla/batch/all/get/kv")
+ @ManagerAuth
+ public R getMatDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<Pla> wrapper = new EntityWrapper<Pla>().setSqlSelect("batch")
+ .andNew().like("batch", condition)
+ .groupBy("batch");
+ List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (Pla pla : plas) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(pla.getBatch());
+ vo.setValue(pla.getBatch());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1