From fe7247af6af58cbc8ea2526e8aa4eedaf545de6c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 三月 2024 13:48:16 +0800
Subject: [PATCH] 增加单据页面单位
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 6b9f66b..2c01801 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -663,7 +663,8 @@
}
orderService.checkComplete(order.getOrderNo());
- SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
}
@@ -804,7 +805,8 @@
return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
}
}
- SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
+ SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
+ null,null,null,null,null);
}
return R.ok("涓嬫灦瀹屾垚");
@@ -1205,15 +1207,16 @@
}
@Override
- public void plaPakin(String locNo, String batch, String packageNo,User user) {
+ public void plaPakin(String locNo, String batch, Integer packageNo,User user) {
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
if(Cools.isEmpty(pla)){
throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
}
- if(Cools.eq(GlobleParameter.PLA_STATUS_1,pla.getStatus())){
- throw new CoolException("璇ョ墿鏂欏凡鍏ュ簱");
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ throw new CoolException("璇ョ墿鏂欑姸鎬佷笉涓哄緟鍏ュ簱锛屾棤娉曞叆搴�");
}
+
pla.setStatus(GlobleParameter.PLA_STATUS_1);
pla.setModifyTime(new Date());
pla.setPakinTime(new Date());
@@ -1227,12 +1230,13 @@
pla.setLocNo(node.getUuid());
plaService.updateById(pla);
- SaasUtils.insertLog(0,locNo,batch+","+packageNo,pla.getWeightAnfme(),user.getUsername());
+ SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
}
@Override
@Transactional
- public void plaPakout(String locNo, String batch, String packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
+ public void plaPakout(String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
@@ -1259,13 +1263,15 @@
//鏇存柊pla鏄庣粏
pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
+ pla.setModifyTime(new Date());
if(pla.getWeightAnfme() <= 0){
- pla.setStatus("鍏ㄩ儴鍑哄簱");
+ pla.setStatus(GlobleParameter.PLA_STATUS_4);
}else {
- pla.setStatus("閮ㄥ垎鍑哄簱");
+ pla.setStatus(GlobleParameter.PLA_STATUS_3);
}
plaService.updateById(pla);
- SaasUtils.insertLog(1,locNo,batch+","+packageNo,anfme,null);
+ SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
//鏇存柊璁㈠崟鏄庣粏
Order order = orderService.selectByNo(orderNo);
@@ -1277,4 +1283,9 @@
orderService.checkComplete(orderNo);
}
+
+ @Override
+ public List<ManPakOut> getManPakoutByOrderNo(String orderNo) {
+ return manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num",orderNo).eq("status",0));
+ }
}
--
Gitblit v1.9.1