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/service/impl/MobileServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 b2c5a16..1a1a1d4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -106,6 +106,7 @@
+
@Override
@Transactional
public void comb(CombParam param, Long userId) {
@@ -1247,7 +1248,7 @@
if(isReplace){
replacePla(pla,manPakOut,plaQty);
}else {
- if((!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_2) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3)) ||
+ if((!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_2) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)) ||
!Cools.eq(pla.getBatch(),manPakOut.getBatch()) ||
!Cools.eq(pla.getPackageNo()+"",manPakOut.getBarcode()) ||
!Cools.eq(pla.getBrand(),manPakOut.getMaktx()) ){
@@ -1332,8 +1333,13 @@
//杩樺師鏃х墿鏂欑姸鎬�
Pla plaOld = plaService.selectByBatchAndPackageNo(manPakOut.getBatch(), Integer.parseInt(manPakOut.getBarcode()), manPakOut.getMaktx());
+ //鏇存柊鏂扮墿鏂欎俊鎭�
+ plaNew.setQtyAnfme(plaOld.getQtyAnfme());
+ plaNew.setStatus(plaOld.getStatus());
+ plaService.updateById(plaNew);
+
plaOld.setStatus(GlobleParameter.PLA_STATUS_1);
- plaOld.setQtyAnfme(0.0);
+ plaOld.setQtyAnfme(plaOld.getQtyAnfme() - manPakOut.getCount());
plaService.updateById(plaOld);
@@ -1352,4 +1358,32 @@
manPakOutService.updateById(manPakOut);
}
+
+ @Override
+ public List<Pla> pdaSelectInfmt(String barcode) {
+ EntityWrapper<Pla> plaEntityWrapper = new EntityWrapper<>();
+ String[] split = barcode.split(";");
+ if (split.length == 4){
+ plaEntityWrapper.eq("brand",split[0]);
+ plaEntityWrapper.eq("batch",split[1]);
+ plaEntityWrapper.eq("package_no",split[2]);
+ plaEntityWrapper.eq("line",split[3]);
+ }else if (split.length == 1){
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", barcode));
+ if (Cools.isEmpty(node)){
+ throw new CoolException("璇锋鏌ヨ緭鍏ョ殑搴撲綅鐮�");
+ }
+ plaEntityWrapper.eq("loc_no",barcode);
+
+ }else {
+ throw new CoolException("鏉＄爜淇℃伅鏈夎!");
+ }
+
+
+ List<Pla> plaList = plaService.selectList(plaEntityWrapper);
+ if (Cools.isEmpty(plaList)){
+ throw new CoolException("鏈煡璇㈠埌搴撳瓨鐗╂枡淇℃伅");
+ }
+ return plaList;
+ }
}
--
Gitblit v1.9.1