jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

工步打印条码修复

Browse Source
tags/yfai-pcn-ext-v1.0
臧学普 10 months ago
parent a817f7eb01
commit 55027bac6b
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File

39
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java
Unescape Escape View File

@ -96,25 +96,26 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog); mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
} }
}else { }else {
String sn = mesProduceSnPrintModel.getProductSn(); String sn = mesProduceSnPrintModel.getProductSn();
MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0); MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
int versionNoLength = numberRule.getSpiltRule().substring(numberRule.getSpiltRule().lastIndexOf(",") + 1).length(); //如下目的主要是截取流水号,主要把流水号转换为32位
Integer serialNoLength = numberRule.getSerialnoLength(); int versionNoLength = numberRule.getSpiltRule().substring(numberRule.getSpiltRule().lastIndexOf(",") + 1).length();
String snPrefix = sn.substring(0, sn.length() - versionNoLength - serialNoLength); Integer serialNoLength = numberRule.getSerialnoLength();
String snSuffix = sn.substring(sn.length() - versionNoLength); String snPrefix = sn.substring(0, sn.length() - versionNoLength - serialNoLength);
String serialNo = sn.substring(sn.length() - versionNoLength - serialNoLength, sn.length() - versionNoLength); String snSuffix = sn.substring(sn.length() - versionNoLength);
String serialNo34 = toBase34(Integer.parseInt(serialNo)); String serialNo = sn.substring(sn.length() - versionNoLength - serialNoLength, sn.length() - versionNoLength);
serialNo34 = stringFormat(serialNo34, 4, false, "0"); String serialNo34 = toBase34(Integer.parseInt(serialNo));
sn = snPrefix + serialNo34 + snSuffix; serialNo34 = stringFormat(serialNo34, 4, false, "0");
//封装打印信息 sn = snPrefix + serialNo34 + snSuffix;
MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo, mesCustomerPart.getCustPartNo(), organizeName); //封装打印信息
printDataModel.setBarcode(sn); MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo34, mesCustomerPart.getCustPartNo(), organizeName);
mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel); printDataModel.setBarcode(sn);
//保存打印记录 mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
MesPrintedSnLog snLog = new MesPrintedSnLog(); //保存打印记录
ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName()); MesPrintedSnLog snLog = new MesPrintedSnLog();
BeanUtil.copyProperties(printDataModel,snLog); ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog); BeanUtil.copyProperties(printDataModel,snLog);
mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
} }
return mesProduceSnPrintModel; return mesProduceSnPrintModel;
} }

5
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/GqaaPrintStrategy.java
Unescape Escape View File

@ -98,6 +98,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
}else { }else {
String sn = mesProduceSnPrintModel.getProductSn(); String sn = mesProduceSnPrintModel.getProductSn();
MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0); MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
//如下目的主要是截取流水号,主要把流水号转换为32位
int versionNoLength = numberRule.getSpiltRule().substring(numberRule.getSpiltRule().lastIndexOf(",") + 1).length(); int versionNoLength = numberRule.getSpiltRule().substring(numberRule.getSpiltRule().lastIndexOf(",") + 1).length();
Integer serialNoLength = numberRule.getSerialnoLength(); Integer serialNoLength = numberRule.getSerialnoLength();
String snPrefix = sn.substring(0, sn.length() - versionNoLength - serialNoLength); String snPrefix = sn.substring(0, sn.length() - versionNoLength - serialNoLength);
@ -107,7 +108,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
serialNo34 = stringFormat(serialNo34, 4, false, "0"); serialNo34 = stringFormat(serialNo34, 4, false, "0");
sn = snPrefix + serialNo34 + snSuffix; sn = snPrefix + serialNo34 + snSuffix;
//封装打印信息 //封装打印信息
MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo, mesCustomerPart.getCustPartNo(), organizeName); MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo34, mesCustomerPart.getCustPartNo(), organizeName);
printDataModel.setBarcode(sn); printDataModel.setBarcode(sn);
mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel); mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
//保存打印记录 //保存打印记录
@ -115,7 +116,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName()); ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
BeanUtil.copyProperties(printDataModel,snLog); BeanUtil.copyProperties(printDataModel,snLog);
mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog); mesProduceSnPrintModel.getMesPrintedSnLogList().add(snLog);
} }
return mesProduceSnPrintModel; return mesProduceSnPrintModel;
} }

Write Preview
Loading…
Cancel
Save