|
|
|
|
@ -69,10 +69,11 @@ public class MesNingDeBarcodePrintStrategy implements IPrintTemplateStrategyServ
|
|
|
|
|
MesCustomerPart customerPart = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesCustomerPart.class.getSimpleName()))
|
|
|
|
|
? (MesCustomerPart)dataMap.get(MesCustomerPart.class.getSimpleName())
|
|
|
|
|
: customerPartService.getMesCustomerPart(mesProduceSnPrintModel.getOrganizeCode(), mesProduceSnPrintModel.getPartNo());
|
|
|
|
|
final String custPartNo = customerPartService.getCustPartNo(mesProduceSnPrintModel.getOrganizeCode(), mesProduceSnPrintModel.getPartNo());
|
|
|
|
|
|
|
|
|
|
if (null == part) MesPcnException.throwBusiException("零件编码[%s]信息不存在!", mesProduceSnPrintModel.getPartNo());
|
|
|
|
|
if (StringUtils.isEmpty(part.getProductMatchRule())) MesPcnException.throwBusiException("零件编码[%s]信息未维护零件条码匹配规则!", mesProduceSnPrintModel.getPartNo());
|
|
|
|
|
if (null == customerPart) MesPcnException.throwBusiException("零件编码[%s]未维护客户零件号!", mesProduceSnPrintModel.getPartNo());
|
|
|
|
|
if (StringUtils.isEmpty(custPartNo)) MesPcnException.throwBusiException("零件编码[%s]未维护客户零件号!", mesProduceSnPrintModel.getPartNo());
|
|
|
|
|
if (null == numberRule) numberRule = numberRuleRepository.getByProperty(
|
|
|
|
|
new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.RULE_CODE},
|
|
|
|
|
new Object[]{mesProduceSnPrintModel.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), part.getProductMatchRule()});
|
|
|
|
|
@ -86,23 +87,23 @@ public class MesNingDeBarcodePrintStrategy implements IPrintTemplateStrategyServ
|
|
|
|
|
if (CollectionUtils.isEmpty(dataMap) || !dataMap.containsKey(MesPart.class.getSimpleName())) genSerialNoModel.putDataMap(MesPart.class.getSimpleName(), part);
|
|
|
|
|
if (CollectionUtils.isEmpty(dataMap) || !dataMap.containsKey(MesCustomerPart.class.getSimpleName())) genSerialNoModel.putDataMap(MesCustomerPart.class.getSimpleName(), customerPart);
|
|
|
|
|
|
|
|
|
|
genSerialNoModel.partSnParam(part.getPartSnParam()).setCustPartNo(customerPart.getCustPartNo());
|
|
|
|
|
genSerialNoModel.partSnParam(part.getPartSnParam()).setCustPartNo(custPartNo);
|
|
|
|
|
List<Object> productSnList = syncFuncService.syncSerialNo(genSerialNoModel, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getOrganizeCode(), mesProduceSnPrintModel.getPrintQty()).getResultList();
|
|
|
|
|
if (CollectionUtils.isEmpty(productSnList)) MesPcnException.throwBusiException("根据编码规则[%s]生成零件条码失败!", genSerialNoModel.getRuleCode());
|
|
|
|
|
for (Object productSn : productSnList) {
|
|
|
|
|
MesProduceSn produceSn = generateMesProduceSn(part, productSn.toString(), mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty());
|
|
|
|
|
Map<String, Object> printTemplateData = generatePrintTemplateData(part, customerPart, numberRule, produceSn, customParamValue);
|
|
|
|
|
Map<String, Object> printTemplateData = generatePrintTemplateData(part, custPartNo, numberRule, produceSn, customParamValue);
|
|
|
|
|
mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
|
|
|
|
|
mesProduceSnPrintModel.getPrintContextList().add(printTemplateData);
|
|
|
|
|
mesProduceSnPrintModel.getMesPrintedSnLogList().add(getMesPrintedSnLog(mesProduceSnPrintModel, part, customerPart, produceSn.getProductSn(), printTemplateData));
|
|
|
|
|
mesProduceSnPrintModel.getMesPrintedSnLogList().add(getMesPrintedSnLog(mesProduceSnPrintModel, part, custPartNo, produceSn.getProductSn(), printTemplateData));
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
MesProduceSn produceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
|
|
|
|
|
Map<String, Object> printTemplateData = generatePrintTemplateData(part, customerPart, numberRule, produceSn, customParamValue);
|
|
|
|
|
Map<String, Object> printTemplateData = generatePrintTemplateData(part, custPartNo, numberRule, produceSn, customParamValue);
|
|
|
|
|
List<Map<String, Object>> printDataMapList = new ArrayList<>();
|
|
|
|
|
printDataMapList.add(printTemplateData);
|
|
|
|
|
mesProduceSnPrintModel.getPrintContextList().add(packResultMap(mesProduceSnPrintModel, printDataMapList));
|
|
|
|
|
mesProduceSnPrintModel.getMesPrintedSnLogList().add(getMesPrintedSnLog(mesProduceSnPrintModel, part, customerPart, produceSn.getProductSn(), printTemplateData));
|
|
|
|
|
mesProduceSnPrintModel.getMesPrintedSnLogList().add(getMesPrintedSnLog(mesProduceSnPrintModel, part, custPartNo, produceSn.getProductSn(), printTemplateData));
|
|
|
|
|
}
|
|
|
|
|
return mesProduceSnPrintModel;
|
|
|
|
|
}
|
|
|
|
|
@ -116,10 +117,10 @@ public class MesNingDeBarcodePrintStrategy implements IPrintTemplateStrategyServ
|
|
|
|
|
return resultMap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private Map<String, Object> generatePrintTemplateData(MesPart part, MesCustomerPart customerPart, MesNumberRule numberRule, MesProduceSn produceSn, Map<String, Object> customParamValue) {
|
|
|
|
|
private Map<String, Object> generatePrintTemplateData(MesPart part, String custPartNo, MesNumberRule numberRule, MesProduceSn produceSn, Map<String, Object> customParamValue) {
|
|
|
|
|
Map<String, Object> printTemplateData = new HashMap<>();
|
|
|
|
|
printTemplateData.put(MesPcnExtConstWords.QR_CODE, customerPart.getCustPartNo());
|
|
|
|
|
printTemplateData.put(MesPcnExtConstWords.CUST_PART_NO, customerPart.getCustPartNo());
|
|
|
|
|
printTemplateData.put(MesPcnExtConstWords.QR_CODE, custPartNo);
|
|
|
|
|
printTemplateData.put(MesPcnExtConstWords.CUST_PART_NO, custPartNo);
|
|
|
|
|
printTemplateData.put(MesPcnExtConstWords.PART_NAME, part.getPartName());
|
|
|
|
|
printTemplateData.put(MesPcnExtConstWords.LOT_NO, StringUtils.isEmpty(numberRule.getPrefix()) ?
|
|
|
|
|
produceSn.getProductSn() : produceSn.getProductSn().replace(numberRule.getPrefix(), MesPcnExtConstWords.EMPTY));
|
|
|
|
|
@ -149,12 +150,12 @@ public class MesNingDeBarcodePrintStrategy implements IPrintTemplateStrategyServ
|
|
|
|
|
return mesProduceSn;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private MesPrintedSnLog getMesPrintedSnLog(MesProduceSnPrintModel mesProduceSnPrintModel, MesPart part, MesCustomerPart customerPart, String productSn, Map<String, Object> printTemplateData) {
|
|
|
|
|
private MesPrintedSnLog getMesPrintedSnLog(MesProduceSnPrintModel mesProduceSnPrintModel, MesPart part, String custPartNo, String productSn, Map<String, Object> printTemplateData) {
|
|
|
|
|
MesPrintedSnLog snLog = new MesPrintedSnLog();
|
|
|
|
|
snLog.setBarcode(productSn);
|
|
|
|
|
snLog.setPartNo(part.getPartNo());
|
|
|
|
|
snLog.setPartName(part.getPartName());
|
|
|
|
|
snLog.setCustPartNo(customerPart.getCustPartNo());
|
|
|
|
|
snLog.setCustPartNo(custPartNo);
|
|
|
|
|
snLog.setPrintContext(printTemplateData);
|
|
|
|
|
ConvertBean.serviceModelInitialize(snLog, mesProduceSnPrintModel.getUserName());
|
|
|
|
|
snLog.setOrganizeCode(mesProduceSnPrintModel.getOrganizeCode());
|
|
|
|
|
|
