|
|
@ -118,7 +118,7 @@ public class MesRawPartChargingServiceImpl implements IMesRawPartChargingService
|
|
|
|
checkNotNull(mesRawPartChargingModel);
|
|
|
|
checkNotNull(mesRawPartChargingModel);
|
|
|
|
ValidatorBean.checkNotNull(mesRawPartChargingModel.getMesRawPackagePart(), "原材料容器零件关系不能为空");
|
|
|
|
ValidatorBean.checkNotNull(mesRawPartChargingModel.getMesRawPackagePart(), "原材料容器零件关系不能为空");
|
|
|
|
ValidatorBean.checkNotNull(mesRawPartChargingModel.getSn(), "原料条码不能为空");
|
|
|
|
ValidatorBean.checkNotNull(mesRawPartChargingModel.getSn(), "原料条码不能为空");
|
|
|
|
ValidatorBean.checkNotNull(mesRawPartChargingModel.getLotNo(), "批次号不能为空");
|
|
|
|
// ValidatorBean.checkNotNull(mesRawPartChargingModel.getLotNo(), "批次号不能为空");
|
|
|
|
//校验是否已扫描
|
|
|
|
//校验是否已扫描
|
|
|
|
List<MesRawPartCharging> mesRawPartCharging = findMesRawPartCharging(mesRawPartChargingModel);
|
|
|
|
List<MesRawPartCharging> mesRawPartCharging = findMesRawPartCharging(mesRawPartChargingModel);
|
|
|
|
if (!CollectionUtils.isEmpty(mesRawPartCharging)) {
|
|
|
|
if (!CollectionUtils.isEmpty(mesRawPartCharging)) {
|
|
|
@ -257,7 +257,7 @@ public class MesRawPartChargingServiceImpl implements IMesRawPartChargingService
|
|
|
|
mesRawPartCharging.setQty(mesRawPartChargingModel.getMesRawPackagePart().getQty());
|
|
|
|
mesRawPartCharging.setQty(mesRawPartChargingModel.getMesRawPackagePart().getQty());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mesRawPartCharging.setLoadPartTime(TimeTool.getNowTime(true));
|
|
|
|
mesRawPartCharging.setLoadPartTime(TimeTool.getNowTime(true));
|
|
|
|
mesRawPartCharging.setLotNo(mesRawPartChargingModel.getLotNo());
|
|
|
|
mesRawPartCharging.setLotNo(StringUtils.isEmpty(mesRawPartChargingModel.getLotNo())?"":mesRawPartChargingModel.getLotNo());
|
|
|
|
mesRawPartCharging.setParentPackageSn(mesRawPartChargingModel.getPackageSn());
|
|
|
|
mesRawPartCharging.setParentPackageSn(mesRawPartChargingModel.getPackageSn());
|
|
|
|
mesRawPartCharging.setPackageId(mesRawPartChargingModel.getMesRawPackageModel().getMesRawPackage().getId());
|
|
|
|
mesRawPartCharging.setPackageId(mesRawPartChargingModel.getMesRawPackageModel().getMesRawPackage().getId());
|
|
|
|
mesRawPartCharging.setFid(UUID.randomUUID().toString());
|
|
|
|
mesRawPartCharging.setFid(UUID.randomUUID().toString());
|
|
|
|