From 2fc7f93972ce21bd0ec3ef5d167a9b53a73c0b59 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 17 四月 2024 14:28:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaController.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 159 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 815f418..ed652b4 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -5,16 +5,20 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.PlaExcelListener;
import com.zy.asrs.utils.SaasUtils;
+import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -24,12 +28,10 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
+@Slf4j
public class PlaController extends BaseController {
@Autowired
@@ -44,6 +46,8 @@
private OrderDetlService orderDetlService;
@Autowired
private PlaLogService plaLogService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/pla/list/auth")
@ManagerAuth
@@ -53,8 +57,19 @@
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<Pla> wrapper = new EntityWrapper<>();
+
+ if(!Cools.isEmpty(param.get("brand"))){
+ wrapper.eq("brand",param.get("brand"));
+ param.remove("brand");
+ }
+ // 娌℃湁閫夋嫨鐨勬椂鍊欓粯璁や笉鏄剧ず宸插嚭搴撶殑鐗╂枡
+ if (Cools.isEmpty(param.get("status"))) {
+ wrapper.ne("status", "鍏ㄩ儴鍑哄簱");
+ }
+
+
convert(param, wrapper);
- wrapper.orderBy("pakin_time",false);
+ wrapper.orderBy("batch",true).orderBy("package_no" ,true);
allLike(Pla.class, param.keySet(), wrapper, condition);
return R.ok(plaService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -75,11 +90,39 @@
System.out.println(plas.toString());
plas.forEach(pla -> {
Pla plaSave = plaService.selectById(pla.getId());
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+
PlaLog plaLog = new PlaLog();
BeanUtils.copyProperties(plaSave,plaLog);
plaLog.setId(null);
+ plaLog.setCreateTime(new Date());
+ plaLog.setModifyUser(getUser().getUsername());
plaLogService.insert(plaLog);
- plaService.updateById(pla);
+
+ });
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pla/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestBody List<Pla> plas) {
+ System.out.println(plas.toString());
+ plas.forEach(pla -> {
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_1)){
+ throw new CoolException("宸插叆搴撶殑鏁版嵁鏃犳硶琚垹闄�");
+ }
+ Pla plaSave = plaService.selectById(pla.getId());
+ pla.setModifyTime(new Date());
+ plaService.deleteById(pla.getId());
+
+ PlaLog plaLog = new PlaLog();
+ BeanUtils.copyProperties(plaSave,plaLog);
+ plaLog.setId(null);
+ plaLog.setCreateTime(new Date());
+ plaLog.setModifyUser(getUser().getUsername());
+ plaLogService.insert(plaLog);
+
});
return R.ok();
}
@@ -104,6 +147,10 @@
for (Pla pla : plas){
+ if(pla.getStockFreeze() == 0){
+ throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
+ }
+
allOrderWeight += pla.getOrderWeight();
if(pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0){
@@ -111,7 +158,8 @@
}
pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
pla.setHandlerBy(getUser().getUsername());
- pla.setStatus("寰呭嚭搴�");
+ pla.setStatus(GlobleParameter.PLA_STATUS_2);
+ pla.setModifyTime(new Date());
pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
//鐢熸垚姝ゆ浣滀笟淇℃伅
PlaQty plaQty = new PlaQty();
@@ -123,7 +171,7 @@
plaService.updateById(pla);
plaQtyService.insert(plaQty);
//鐢熸垚鎷ｈ揣鍗�
- addPakOUT(plaQty);
+ addPakOUT(plaQty,getUserId());
};
@@ -149,6 +197,13 @@
return R.ok();
}
+ @RequestMapping(value = "/pla/viladate/auth")
+ @ManagerAuth
+ public R viladate(@RequestBody List<Pla> plas) {
+ plaService.viladate(plas,getUser());
+ return R.ok();
+ }
+
@RequestMapping(value = "/pla/rework/auth")
@ManagerAuth
public R rework(@RequestBody List<Pla> plas) {
@@ -158,10 +213,81 @@
pla.setModifyTime(new Date());
pla.setWeightAnfme(0.0);
plaService.updateById(pla);
- SaasUtils.insertLog(1,pla.getLocNo(),pla.getBatch()+","+pla.getPackageNo(),anfme,getUser().getUsername());
+ SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
});
return R.ok();
+ }
+
+ @RequestMapping(value = "/pla/updateStockFreeze")
+ @Transactional
+ @ManagerAuth(memo = "搴撲綅鍐荤粨")
+ public R updateStockFreeze(@RequestBody List<Pla> plas){
+ if (Cools.isEmpty(plas)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (Pla pla : plas){
+ if (pla.getStockFreeze() == 0){
+ throw new CoolException("搴撳瓨宸茶鍐荤粨锛�");
+ }
+ pla.setStockFreeze(0);
+ pla.setStockFreezeBy(getUser().getUsername());
+ pla.setStockFreezeDate(new Date());
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+ }
+ return R.ok("鍐荤粨鎴愬姛");
+ }
+
+ @RequestMapping(value = "/pla/updateStockDisFreeze")
+ @ManagerAuth(memo = "搴撲綅瑙ｅ喕")
+ public R updateStockDisFreeze(@RequestBody List<Pla> plas){
+ if (Cools.isEmpty(plas)){
+ return R.error("鏃犳暟鎹�");
+ }
+ for (Pla pla : plas){
+ if (pla.getStockFreeze() == 1){
+ throw new CoolException("搴撲綅鏈喕缁擄紝鏃犻渶瑙ｅ喕");
+ }
+ if(!Cools.eq(pla.getStockFreezeBy(),getUser().getUsername())){
+ throw new CoolException("鏃犳硶瑙ｅ喕鍏朵粬鐢ㄦ埛鍐荤粨鐨勫簱浣�");
+ }
+ pla.setStockFreeze(1);
+ pla.setStockFreezeBy(getUser().getUsername());
+ pla.setStockFreezeDate(new Date());
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+
+ }
+ return R.ok("瑙ｉ櫎鍐荤粨鎴愬姛");
+ }
+
+ @RequestMapping(value = "/matMaktxQuery/auth")
+ @ManagerAuth
+ public R queryMat(String condition) {
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.like("maktx", condition);
+ Page<Mat> page = matService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Mat mat : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", mat.getMaktx());
+ map.put("value", mat.getMaktx());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/pla/statis/auth")
+ @ManagerAuth
+ public R statis(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param) {
+
+ Page<Pla> stockStatis = plaService.getStockStatisAll(toPage(curr, limit, param, Pla.class));
+
+ return R.ok().add(stockStatis);
}
/**
@@ -189,9 +315,26 @@
try {
EasyExcel.read(file.getInputStream(), PlaExcel.class, listener).sheet().doRead();
}catch (Exception e){
- throw new CoolException("瀵煎叆鐨勬暟鎹牸寮忛敊璇紝鍘熷洜锛�" + e.getMessage());
+ e.printStackTrace();
+ int index = listener.getIndex() - 1;
+ throw new CoolException("瀵煎叆鐨勬暟鎹牸寮忛敊璇紝鍘熷洜锛�" + e.getMessage() + "锛岀" + index + "锛屾暟鎹牸寮忎笉瀵�");
}
+ log.info("瀵煎叆淇敼淇℃伅杈撳嚭锛�" + listener.getRecordLog());
return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉la鐗╂枡鏁版嵁");
+ }
+
+ // 鎵撳嵃
+ @RequestMapping(value = "/pla/print/auth")
+ @ManagerAuth(memo = "pla缂栫爜鎵撳嵃")
+ public R matCodePrint(@RequestBody List<Pla> plas) {
+ if(Cools.isEmpty(plas)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<Pla> res = new ArrayList<>();
+ for (Pla pla : plas){
+ res.add(pla);
+ }
+ return R.ok().add(res);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -211,7 +354,7 @@
}
}
- private R addPakOUT(PlaQty plaQty){
+ private R addPakOUT(PlaQty plaQty,Long userId){
ManPakOut manPakOut=new ManPakOut();
manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
manPakOut.setWrkSts((long)1);
@@ -219,7 +362,7 @@
manPakOut.setMaktx(plaQty.getBrand());
manPakOut.setLocNo(plaQty.getLocNo());
manPakOut.setBatch(plaQty.getBatch());
- manPakOut.setBarcode(plaQty.getPackageNo());
+ manPakOut.setBarcode(plaQty.getPackageNo() + "");
manPakOut.setUuid(String.valueOf(System.currentTimeMillis()));
manPakOut.setCreateTime(new Date());
manPakOut.setUpdateTime(new Date());
@@ -228,6 +371,10 @@
manPakOut.setStatus(0);
manPakOut.setDocId(plaQty.getOrderDetlId());
manPakOut.setNodeId(plaQty.getId());
+ manPakOut.setCustName(plaQty.getCustomer());
+ manPakOut.setCreateBy(userId);
+ //棰勮鍙戣揣鏃堕棿
+ manPakOut.setSpecs(plaQty.getPakoutTime());
//manPakOut.setNodeId(plaQty.getOrderDetlId());
manPakOutService.insert(manPakOut);
return R.ok();
--
Gitblit v1.9.1