From 8a9b1bc2a82166cfa563bc32057503a0274c561d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 22 二月 2024 15:37:19 +0800
Subject: [PATCH] 海诺尔 物料打印码 pda移库增加
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index e247647..d87ab5a 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -27,7 +27,7 @@
@Autowired
private PlaQtyService plaQtyService;
- public Pla selectByBatchAndPackageNo(String batch, String packageNo) {
+ public Pla selectByBatchAndPackageNo(String batch, Integer packageNo) {
return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo));
}
@@ -65,7 +65,7 @@
}
//闇�瑕佸噺鍘绘娆″嚭搴撻瑙堝叾浠栬鍗曢渶鍑哄簱鐨勬暟閲�
for (PlaQty plaQty : plaQties){
- if(Cools.eq(plaQty.getBatch(),pla.getBatch()) && Cools.eq(plaQty.getPackageNo(),pla.getPackageNo())){
+ if(Cools.eq(plaQty.getBatch(),pla.getBatch()) && plaQty.getPackageNo() == pla.getPackageNo()){
weightAnfme -= plaQty.getQtyAnfme();
}
}
@@ -84,7 +84,7 @@
}
if(anfme > 0){
- PlaQty plaQty = new PlaQty(orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getId(),orderDetl.getOrderId(),orderDetl.getOrderNo(),anfme,null,new Date());
+ PlaQty plaQty = new PlaQty(orderDetl.getBatch(),Integer.parseInt(orderDetl.getBrand()),orderDetl.getId(),orderDetl.getOrderId(),orderDetl.getOrderNo(),anfme,null,new Date());
plaQties.add(plaQty);
}
@@ -124,7 +124,7 @@
pla.setStatus(GlobleParameter.PLA_STATUS_1);
this.updateById(pla);
- SaasUtils.insertLog(0,pla.getLocNo(),pla.getBatch()+","+pla.getPackageNo(),plaQty.getOrderWeight(),user.getUsername());
+ SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),null,pla.getBatch(),pla.getPackageNo());
});
}
--
Gitblit v1.9.1