From 5d6c454638445a2e28e478e9d971fbdd73b7eb2c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 九月 2024 14:29:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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..dc23bfc 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -3,14 +3,17 @@
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;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
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;
@@ -48,6 +51,9 @@
private PlaLogService plaLogService;
@Autowired
private MatService matService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
@RequestMapping(value = "/pla/list/auth")
@ManagerAuth
@@ -67,6 +73,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 +159,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();
@@ -214,7 +229,7 @@
pla.setWeightAnfme(0.0);
plaService.updateById(pla);
SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
return R.ok();
@@ -229,7 +244,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 +264,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 +354,27 @@
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")
+ .orderBy("batch",false);
+ 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());
@@ -354,9 +392,10 @@
}
}
+ @Synchronized
private R addPakOUT(PlaQty plaQty,Long userId){
ManPakOut manPakOut=new ManPakOut();
- manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
+ manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+String.valueOf(snowflakeIdWorker.nextId()));
manPakOut.setWrkSts((long)1);
manPakOut.setAnfme(plaQty.getOrderWeight());
manPakOut.setMaktx(plaQty.getBrand());
--
Gitblit v1.9.1