Skip to content

M
mes
Commit a253b175 authored by 温志超's avatar 温志超
Browse files
Options

更新排产寻找条码规则逻辑

parent e25d849e
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
mes/src/main/java/com/ximai/mes/pro/schedule/impl/busi/ProductQrcodeBuild.java
View file @ a253b175
......@@ -35,30 +35,30 @@ public class ProductQrcodeBuild implements ScheduleBusiProcess{
if(rule ==null){
return;
}
//wzc修改 有客户优先按照产品+客户匹配序列号规则绑定的最新打印模板，如果没有匹配到 按照产品匹配序列号规则绑定的最新打印模板（客户字段为空的）
ProProductQrcodeRuleDto proProductQrcodeRuleDto= null;
List<ProProductQrcodeRuleDto> list = null;
if(StringUtils.isNotEmpty(workorder.getClientCode())){
QueryWrapper<ProProductQrcodeRule> query = new QueryWrapper<>();
query.eq("m.item_id", workorder.getProductId());
query.eq( "m.client_code", workorder.getClientCode());
query.orderByDesc("m.rule_id");
list = proProductQrcodeRuleService.selectProProductQrcodeRuleDtoList(query);
}else{
QueryWrapper<ProProductQrcodeRule> query = new QueryWrapper<>();
query.eq("m.item_id", workorder.getProductId());
query.isNull( "m.client_code");
query.orderByDesc("m.rule_id");
list = proProductQrcodeRuleService.selectProProductQrcodeRuleDtoList(query);
}
if(list != null && list.size() > 0){
proProductQrcodeRuleDto = list.get(0);
}
if (proProductQrcodeRuleDto == null || StringUtils.isEmpty(proProductQrcodeRuleDto.getTemplateName())){
//后续再看是否需要报错
// ExceptionUtil.checkTrueThrowException(true,
// "未能匹配到打印模板，请先到产品二维码规则维护");
}
// //wzc修改 有客户优先按照产品+客户匹配序列号规则绑定的最新打印模板，如果没有匹配到 按照产品匹配序列号规则绑定的最新打印模板（客户字段为空的）
// ProProductQrcodeRuleDto proProductQrcodeRuleDto= null;
// List<ProProductQrcodeRuleDto> list = null;
// if(StringUtils.isNotEmpty(workorder.getClientCode())){
// QueryWrapper<ProProductQrcodeRule> query = new QueryWrapper<>();
// query.eq("m.item_id", workorder.getProductId());
// query.eq( "m.client_code", workorder.getClientCode());
// query.orderByDesc("m.rule_id");
// list = proProductQrcodeRuleService.selectProProductQrcodeRuleDtoList(query);
// }else{
// QueryWrapper<ProProductQrcodeRule> query = new QueryWrapper<>();
// query.eq("m.item_id", workorder.getProductId());
// query.isNull( "m.client_code");
// query.orderByDesc("m.rule_id");
// list = proProductQrcodeRuleService.selectProProductQrcodeRuleDtoList(query);
// }
// if(list != null && list.size() > 0){
// proProductQrcodeRuleDto = list.get(0);
// }
// if (proProductQrcodeRuleDto == null || StringUtils.isEmpty(proProductQrcodeRuleDto.getTemplateName())){
// //后续再看是否需要报错
//// ExceptionUtil.checkTrueThrowException(true,
//// "未能匹配到打印模板，请先到产品二维码规则维护");
// }
List<String> qrcodes = productQrcodeRuleService.buildQrcode(rule, job.getQuantity().intValue());
for(String qrcode : qrcodes){
ProProductQrcodeRecordCreate create = new ProProductQrcodeRecordCreate();
......@@ -66,10 +66,10 @@ public class ProductQrcodeBuild implements ScheduleBusiProcess{
create.initByWorkorder(workorder);
create.setItemDesc(rule.getItemDesc());
//产品序列打印记录增加模板相关内容
create.setTemplateId(proProductQrcodeRuleDto != null ? proProductQrcodeRuleDto.getTemplateId() : null);
create.setTemplateCode(proProductQrcodeRuleDto != null ? proProductQrcodeRuleDto.getTemplateCode() : null);
create.setTemplateName(proProductQrcodeRuleDto != null ? proProductQrcodeRuleDto.getTemplateName() : null);
create.setTemplateType(proProductQrcodeRuleDto != null ? proProductQrcodeRuleDto.getTemplateType() : null);
create.setTemplateId(rule != null ? rule.getTemplateId() : null);
create.setTemplateCode(rule != null ? rule.getTemplateCode() : null);
create.setTemplateName(rule != null ? rule.getTemplateName() : null);
create.setTemplateType(rule != null ? rule.getTemplateType() : null);
productQrcodeRecordService.insertProProductQrcodeRecord(create);
}
});
......
mes/src/main/java/com/ximai/mes/pro/service/impl/ProProductQrcodeRuleServiceImpl.java
View file @ a253b175
......@@ -79,6 +79,7 @@ public class ProProductQrcodeRuleServiceImpl implements IProProductQrcodeRuleSer
QueryWrapper<ProProductQrcodeRule> proProductQrcodeRuleQuery = new QueryWrapper<>();
proProductQrcodeRuleQuery.eq("item_id", itemId);
proProductQrcodeRuleQuery.eq(StringUtils.isNotEmpty(clientCode),"client_code", clientCode);
proProductQrcodeRuleQuery.isNull(StringUtils.isEmpty(clientCode),"client_code");
proProductQrcodeRuleQuery.orderByDesc("create_time");
List<ProProductQrcodeRule> list = this.selectProProductQrcodeRuleList(proProductQrcodeRuleQuery);
if(list.size()>0){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment