From 9c199e1f139b2e6eca02addd1eb6d55d11b41475 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 21 三月 2022 14:41:49 +0800
Subject: [PATCH] 修复bug
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 172 insertions(+), 0 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 165c823..2e299b5 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -37,6 +37,10 @@
private ReceiveService receiveService;
@Autowired
private ReceiveDetlService receiveDetlService;
+ @Autowired
+ private PickoutService pickoutService;
+ @Autowired
+ private PickoutDetlService pickoutDetlService;
@Transactional
public List<StoPreTab> stockOutPreview(OrderStoDto orderStoDto, Long hostId) {
@@ -186,7 +190,79 @@
});
return res;
}
+ public List<StoPreTab> orderOutPreview(OrderStoDto orderStoDto, Long hostId){
+ if (Cools.isEmpty(orderStoDto) || Cools.isEmpty(orderStoDto.getDtos())) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ List<StoPreTab> res = new ArrayList<>();
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+// locDetlService.checkLocDetlCount(orderStoDto.getDtos());
+ for (MatnrDto matnrDto : orderStoDto.getDtos()) {
+ // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ Mat mat = matService.selectByMatnr(hostId, matnrDto.getMatnr());
+ if (null == mat) {
+ throw new CoolException(matnrDto.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + orderStoDto.getOrderNo() +"鍗曟嵁鍥犳涓柇锛�");
+ }
+
+ Double sumAnfme = Optional.ofNullable(locDetlService.selectCountByMatnr(mat.getMatnr(), hostId)).orElse(0.0D);
+ double lack = 0.0D;
+ // 缂鸿揣
+ if (sumAnfme < matnrDto.getCount()) {
+ lack = matnrDto.getCount() - sumAnfme;
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(mat.getMaktx() + "锛�" + mat.getMatnr() + "锛�");
+ tab.setMatnr(mat.getMatnr());
+ tab.setMaktx(mat.getMaktx());
+ tab.setAnfme(matnrDto.getCount());
+ tab.setLocNo("缂鸿揣");
+ tab.setTotal(lack);
+ tab.setReduce(lack);
+ tab.setRemQty(0.0D);
+ tab.setPrior(false);
+ tab.setPrior$("脳");
+ tab.setType(0);
+ res.add(tab);
+ }
+
+ // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+ List<LocDetl> locDetls = locDetlService.findOfSort(hostId, mat.getMatnr());
+ double issued = Optional.of(matnrDto.getCount() - lack).orElse(0.0D) ;
+ double anfme = issued;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(mat.getMaktx() + "锛�" + mat.getMatnr() + "锛�");
+ tab.setMatnr(mat.getMatnr());
+ tab.setMaktx(mat.getMaktx());
+ tab.setAnfme(matnrDto.getCount());
+
+ tab.setLocNo(locDetl.getLocNo());
+ tab.setNodeId(locDetl.getNodeId());
+ tab.setTotal(locDetl.getAnfme());
+ tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ tab.setRemQty(tab.getTotal() - tab.getReduce());
+ tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+ tab.setPrior$(tab.getPrior()?"鉁�":"脳");
+ tab.setType(1);
+ res.add(tab);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+
+ }
+ res.sort(new Comparator<StoPreTab>() {
+ @Override
+ public int compare(StoPreTab o1, StoPreTab o2) {
+// return o1.getMatnr().length() - o2.getMatnr().length();
+ return (int) (o1.getAnfme() - o2.getAnfme());
+ }
+ });
+ return res;
+ }
@Transactional
public void stockOutProcess(OrderStoDto orderStoDto, Long hostId) {
if (Cools.isEmpty(orderStoDto) || Cools.isEmpty(orderStoDto.getDtos())) {
@@ -316,6 +392,8 @@
}
}
+
+
public static void main(String[] args) {
for (int i = 2; i < 51; i++) {
@@ -329,4 +407,98 @@
"GO");
}
}
+
+
+ public void orderStockOutProcess(OrderStoDto orderStoDto, Long hostId, Long userId) {
+ if (Cools.isEmpty(orderStoDto) || Cools.isEmpty(orderStoDto.getDtos())) {
+ return;
+ }
+
+// Receive receive = receiveService.selectByOrderNo(receiveStoDto.getOrderNo(), hostId);
+ Order order = orderService.selectByOrderNo(orderStoDto.getOrderNo(), hostId);
+ if (order == null) {
+ throw new CoolException(orderStoDto.getOrderNo() + "鍗曟嵁涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+ locDetlService.checkLocDetlCount(orderStoDto.getDtos(), hostId);
+
+ for (MatnrDto matnrDto : orderStoDto.getDtos()) {
+ // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ Mat mat = matService.selectByMatnr(hostId, matnrDto.getMatnr());
+ if (null == mat) {
+ throw new CoolException(matnrDto.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + matnrDto.getCount() +"鍗曟嵁鍥犳涓柇锛�");
+ }
+ // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+ List<LocDetl> locDetls = locDetlService.findOfSort(hostId, mat.getMatnr());
+ double issued = Optional.ofNullable(matnrDto.getCount()).orElse(0.0D);
+ Pickout pickout = new Pickout();
+ pickout.setHostId(hostId);
+ pickout.setUserId(userId);
+ pickout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+ pickout.setWrkSts(1L);
+ pickout.setCreateBy(userId.intValue());
+ pickout.setUpdateBy(userId.intValue());
+ pickoutService.insert(pickout);
+ for (LocDetl locDetl : locDetls) {
+
+ if (issued > 0) {
+ PickoutDetl pickoutDetl = new PickoutDetl();
+ pickoutDetl.setHeadId(pickout.getId());
+ pickoutDetl.setNodeId(locDetl.getNodeId());
+ pickoutDetl.setNodeName(locDetl.getLocNo());
+ pickoutDetl.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ pickoutDetl.setMatnr(locDetl.getMatnr());
+ pickoutDetl.setMaktx(locDetl.getMaktx());
+ pickoutDetl.setName(locDetl.getName());
+ pickoutDetl.setSpecs(locDetl.getSpecs());
+ pickoutDetl.setModel(locDetl.getModel());
+ pickoutDetl.setBatch(locDetl.getBatch());
+ pickoutDetl.setUnit(locDetl.getUnit());
+ pickoutDetl.setBarcode(locDetl.getBarcode());
+ pickoutDetl.setPrice(locDetl.getPrice());
+ pickoutDetl.setWeight(locDetl.getWeight());
+ pickoutDetl.setStatus(1);
+ pickoutDetl.setCreateBy(userId.intValue());
+ pickoutDetl.setUpdateBy(userId.intValue());
+
+// // 淇濆瓨鍑哄簱閫氱煡鍗�
+// Pakout pakout = new Pakout();
+// pakout.setHostId(hostId);
+// pakout.setWrkSts(1L);
+// pakout.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+// pakout.setZpallet(locDetl.getZpallet());
+// pakout.setLocNo(locDetl.getLocNo());
+// pakout.setNodeId(locDetl.getNodeId());
+// pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+// VersionUtils.setPakout(pakout, mat);
+// pakout.setDocId(receive.getDocType()); // 鍗曟嵁绫诲瀷
+// pakout.setDocNum(receive.getOrderNo()); // 鍗曟嵁缂栧彿
+// pakout.setCreateTime(now);
+// pakout.setUpdateTime(now);
+// pakout.setStatus(1);
+ if (!pickoutDetlService.insert(pickoutDetl)) {
+ throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
+ }
+ if (issued>=locDetl.getAnfme()) {
+// // 鍒犻櫎搴撳瓨鏄庣粏
+// if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
+// throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+// }
+ } else {
+// // 淇敼搴撳瓨鏄庣粏鏁伴噺
+// if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
+// throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+// }
+ }
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+ // 淇敼鍗曟嵁鐘舵��
+ if (!orderService.updateSettle(orderStoDto.getOrderNo(), 2L, hostId)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
+ }
}
--
Gitblit v1.9.1