From 273e605c07488911229da645df2f4b128c2d14e4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 28 二月 2024 08:35:02 +0800
Subject: [PATCH] 海诺尔 物料打印码 pda移库增加
---
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 111 +++++++++++++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index 83bc4ef..4cf7385 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -75,38 +75,8 @@
}
Pla pla = plaService.selectByBatchAndPackageNo(excel.getBatch(),excel.getPackageNo());
if (pla == null) {
- pla = excel;
- pla.setStep(2);
pla.setCreateTime(new Date());
- pla.setModifyTime(new Date());
- pla.setStatus(GlobleParameter.PLA_STATUS_00);
- pla.setStockFreeze(1);
- pla.setWeightAnfme(pla.getWeight());
- Mat mat = matService.selectByMaktx(pla.getBrand());
- if(Cools.isEmpty(mat)){
- throw new CoolException("鏃犳硶鎵惧埌瀵瑰簲鐨勭墝鍙蜂俊鎭紝鐗屽彿=" + pla.getBrand());
- }
- pla.setMatnr(mat.getMatnr());
- try {
- pla.setType(getType(mat.getMatnr()));
- //杞﹂棿銆佷骇绾裤�佷富浣�
- setPla(pla);
- }catch (Exception e){
- log.info(e.getMessage() + "Pla: " + pla.getBatch());
- throw new CoolException(e.getMessage() + "锛屾壒鍙凤細" + excel.getBatch() + ", 鍖呭彿锛�" + excel.getPackageNo());
- }
-
- if(!Cools.isEmpty(pla.getLocNo())){
- Node node = nodeService.selectByUuid(pla.getLocNo());
- if(Cools.isEmpty(node)){
- throw new CoolException("鏈兘鎵惧埌鐩稿簲鐨勫簱浣嶄俊鎭紝搴撲綅缂栧彿=" +pla.getLocNo());
- //log.info("鏈兘鎵惧埌鐩稿簲鐨勫簱浣嶄俊鎭紝搴撲綅缂栧彿={}",pla.getLocNo());
- }
- pla.setStash(node.getParentName());
- pla.setLocNo(node.getUuid());
- pla.setStatus(GlobleParameter.PLA_STATUS_1);
- pla.setPakinTime(new Date());
- }
+ plaCreate(pla,excel,matService,nodeService);
try {
plaService.insert(pla);
}catch (Exception e){
@@ -117,13 +87,15 @@
// throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
// }
total++;
- }else if (pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
+ }else if(Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1) || Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_00)){
excel.setId(pla.getId());
excel.setCreateTime(pla.getCreateTime());
- excel.setModifyTime(new Date());
- excel.setStep(2);
- excel.setStatus(GlobleParameter.PLA_STATUS_00);
+ excel.setStatus(pla.getStatus());
+ excel.setPakinTime(pla.getPakinTime());
+ excel.setStash(pla.getStash());
+ excel.setLocNo(pla.getLocNo());
BeanUtils.copyProperties(excel,pla);
+ pla = plaCreate(pla,excel,matService,nodeService);
try {
plaService.updateById(pla);
}catch (Exception e){
@@ -159,19 +131,24 @@
String batch = pla.getBatch();
String line = batch.substring(8,10);
- pla.setLine(line);
- if("绾爲鑴�".equals(pla.getType())){
- if("01".equals(line) || "02".equals(line)){
- pla.setOwner(OWNER_HZ);
- pla.setWorkshop("涓�杞﹂棿");
- }else {
- pla.setOwner(OWNER_HNE);
- pla.setWorkshop("涓夎溅闂�");
- }
- }else if ("鏀规�ф爲鑴�".equals(pla.getType())){
- if ("01".equals(line) || "02".equals(line) || "03".equals(line) || "04".equals(line)){
- pla.setOwner(OWNER_HNE);
- pla.setWorkshop("浜岃溅闂�");
+ if(Cools.isEmpty(pla.getLine())){
+ pla.setLine(line);
+ }
+
+ if(Cools.isEmpty(pla.getOwner()) && Cools.isEmpty(pla.getWorkshop())){
+ if("绾爲鑴�".equals(pla.getType())){
+ if("01".equals(line) || "02".equals(line)){
+ pla.setOwner(OWNER_HZ);
+ pla.setWorkshop("涓�杞﹂棿");
+ }else {
+ pla.setOwner(OWNER_HNE);
+ pla.setWorkshop("涓夎溅闂�");
+ }
+ }else if ("鏀规�ф爲鑴�".equals(pla.getType())){
+ if ("01".equals(line) || "02".equals(line) || "03".equals(line) || "04".equals(line)){
+ pla.setOwner(OWNER_HNE);
+ pla.setWorkshop("浜岃溅闂�");
+ }
}
}
}
@@ -188,4 +165,42 @@
public int getTotal() {
return total;
}
+
+ private Pla plaCreate(Pla pla, PlaExcel excel, MatService matService, NodeService nodeService){
+ pla = excel;
+ pla.setStep(2);
+ pla.setModifyTime(new Date());
+ pla.setStatus(GlobleParameter.PLA_STATUS_00);
+ pla.setStockFreeze(1);
+ pla.setWeightAnfme(pla.getWeight());
+ Mat mat = matService.selectByMaktx(pla.getBrand());
+ if(Cools.isEmpty(mat)){
+ throw new CoolException("鏃犳硶鎵惧埌瀵瑰簲鐨勭墝鍙蜂俊鎭紝鐗屽彿=" + pla.getBrand());
+ }
+ pla.setMatnr(mat.getMatnr());
+ try {
+ if(Cools.isEmpty(pla.getType())){
+ pla.setType(getType(mat.getMatnr()));
+ }
+ //杞﹂棿銆佷骇绾裤�佷富浣�
+ setPla(pla);
+ }catch (Exception e){
+ log.info(e.getMessage() + "Pla: " + pla.getBatch());
+ throw new CoolException(e.getMessage() + "锛屾壒鍙凤細" + excel.getBatch() + ", 鍖呭彿锛�" + excel.getPackageNo());
+ }
+
+ if(!Cools.isEmpty(pla.getLocNo())){
+ Node node = nodeService.selectByUuid(pla.getLocNo());
+ if(Cools.isEmpty(node)){
+ throw new CoolException("鏈兘鎵惧埌鐩稿簲鐨勫簱浣嶄俊鎭紝搴撲綅缂栧彿=" +pla.getLocNo());
+ //log.info("鏈兘鎵惧埌鐩稿簲鐨勫簱浣嶄俊鎭紝搴撲綅缂栧彿={}",pla.getLocNo());
+ }
+ pla.setStash(node.getParentName());
+ pla.setLocNo(node.getUuid());
+ pla.setStatus(GlobleParameter.PLA_STATUS_1);
+ pla.setPakinTime(new Date());
+ }
+
+ return pla;
+ }
}
--
Gitblit v1.9.1