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 | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index ba3b843..ed652b4 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -18,6 +18,7 @@
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;
@@ -30,6 +31,7 @@
import java.util.*;
@RestController
+@Slf4j
public class PlaController extends BaseController {
@Autowired
@@ -60,9 +62,14 @@
wrapper.eq("brand",param.get("brand"));
param.remove("brand");
}
+ // 娌℃湁閫夋嫨鐨勬椂鍊欓粯璁や笉鏄剧ず宸插嚭搴撶殑鐗╂枡
+ if (Cools.isEmpty(param.get("status"))) {
+ wrapper.ne("status", "鍏ㄩ儴鍑哄簱");
+ }
+
convert(param, wrapper);
- wrapper.orderBy("modify_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));
}
@@ -90,6 +97,7 @@
BeanUtils.copyProperties(plaSave,plaLog);
plaLog.setId(null);
plaLog.setCreateTime(new Date());
+ plaLog.setModifyUser(getUser().getUsername());
plaLogService.insert(plaLog);
});
@@ -101,8 +109,8 @@
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)){
- throw new CoolException("闈炲緟鍏ュ簱鐨勬暟鎹棤娉曡鍒犻櫎");
+ 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());
@@ -112,6 +120,7 @@
BeanUtils.copyProperties(plaSave,plaLog);
plaLog.setId(null);
plaLog.setCreateTime(new Date());
+ plaLog.setModifyUser(getUser().getUsername());
plaLogService.insert(plaLog);
});
@@ -162,7 +171,7 @@
plaService.updateById(pla);
plaQtyService.insert(plaQty);
//鐢熸垚鎷ｈ揣鍗�
- addPakOUT(plaQty);
+ addPakOUT(plaQty,getUserId());
};
@@ -307,8 +316,10 @@
EasyExcel.read(file.getInputStream(), PlaExcel.class, listener).sheet().doRead();
}catch (Exception e){
e.printStackTrace();
- throw new CoolException("瀵煎叆鐨勬暟鎹牸寮忛敊璇紝鍘熷洜锛�" + e.getMessage() + "锛岀" + listener.getIndex() + "锛屾暟鎹牸寮忎笉瀵�");
+ int index = listener.getIndex() - 1;
+ throw new CoolException("瀵煎叆鐨勬暟鎹牸寮忛敊璇紝鍘熷洜锛�" + e.getMessage() + "锛岀" + index + "锛屾暟鎹牸寮忎笉瀵�");
}
+ log.info("瀵煎叆淇敼淇℃伅杈撳嚭锛�" + listener.getRecordLog());
return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉la鐗╂枡鏁版嵁");
}
@@ -343,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);
@@ -361,6 +372,9 @@
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