展示组件

tags/yfai-pcn-ext-v1.0
微笑着面对明天 1 year ago
parent 6444e8ee7f
commit 3b2043c746

@ -125,6 +125,10 @@ public class MesEquipmentLogService implements IMesEquipmentLogService {
mesEquipmentLogDetail.setCraftCode(mesEquipmentRecord.getCraftCode()); mesEquipmentLogDetail.setCraftCode(mesEquipmentRecord.getCraftCode());
mesEquipmentLogDetail.setProcessCode(mesEquipmentRecord.getProcessCode()); mesEquipmentLogDetail.setProcessCode(mesEquipmentRecord.getProcessCode());
mesEquipmentLogDetail.setWorkCenterCode(mesEquipmentRecord.getWorkCenterCode()); mesEquipmentLogDetail.setWorkCenterCode(mesEquipmentRecord.getWorkCenterCode());
mesEquipmentLogDetail.setId(null);
mesEquipmentLogDetail.setCreateDatetime(null);
mesEquipmentLogDetail.setCreateUser(null);
String jsonStr = mesEquipmentRecord.getProduceSnJson(); String jsonStr = mesEquipmentRecord.getProduceSnJson();
if (!StringUtils.isEmpty(jsonStr)) { if (!StringUtils.isEmpty(jsonStr)) {

@ -19,7 +19,7 @@ public class MesNumberRuleMatchCompareRangeService implements IMesNumberRuleMatc
@Override @Override
public Boolean matchNumberRule(String organizeCode, String sn, Object... params) { public Boolean matchNumberRule(String organizeCode, String sn, Object... params) {
Object obj = params[0].toString(); Object obj = params[0];
if (obj instanceof MesProductionAssemblyNosortContext) { if (obj instanceof MesProductionAssemblyNosortContext) {
MesProductionAssemblyNosortContext context = (MesProductionAssemblyNosortContext) obj; MesProductionAssemblyNosortContext context = (MesProductionAssemblyNosortContext) obj;
if (StringUtils.isEmpty(context.getMaxValue()) || StringUtils.isEmpty(context.getMinValue())) { if (StringUtils.isEmpty(context.getMaxValue()) || StringUtils.isEmpty(context.getMinValue())) {

@ -64,7 +64,7 @@ public class MesNumberRuleMatchSnService implements IMesNumberRuleMatchDispatchS
LOGGER.info("条码:{}, 条码状态未完成 snStatus={}", mesProduceSn.getProductSn(), mesProduceSn.getSnStatus()); LOGGER.info("条码:{}, 条码状态未完成 snStatus={}", mesProduceSn.getProductSn(), mesProduceSn.getSnStatus());
return false; return false;
} }
Object obj = params[0].toString(); Object obj = params[0];
if (!(obj instanceof MesProductionAssemblyNosortContext)) { if (!(obj instanceof MesProductionAssemblyNosortContext)) {
return false; return false;
} }

Loading…
Cancel
Save