|
|
@ -47,10 +47,11 @@ class MesToPiscesProductionAssembly {
|
|
|
|
if (!Objects.isNull(mesProduceSn)) {
|
|
|
|
if (!Objects.isNull(mesProduceSn)) {
|
|
|
|
rowMap.put("ASSEMBLY_BARCODE_ID", mesProduceSn.getId())
|
|
|
|
rowMap.put("ASSEMBLY_BARCODE_ID", mesProduceSn.getId())
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
rowMap.put("ASSEMBLY_BARCODE_ID", 0)
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("assembly_sn")))
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("assembly_sn")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
rowMap.put("ASSEMBLY_BARCODE_ID", null)
|
|
|
|
rowMap.put("ASSEMBLY_BARCODE_ID", 0)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//条码
|
|
|
|
//条码
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("product_sn"))) {
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("product_sn"))) {
|
|
|
@ -58,10 +59,11 @@ class MesToPiscesProductionAssembly {
|
|
|
|
if (!Objects.isNull(mesProduceSn)) {
|
|
|
|
if (!Objects.isNull(mesProduceSn)) {
|
|
|
|
rowMap.put("BARCODE_ID", mesProduceSn.getId())
|
|
|
|
rowMap.put("BARCODE_ID", mesProduceSn.getId())
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
rowMap.put("BARCODE_ID", 0)
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("product_sn")))
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("product_sn")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
rowMap.put("BARCODE_ID", null)
|
|
|
|
rowMap.put("BARCODE_ID", 0)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//加工记录表
|
|
|
|
//加工记录表
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("production_record_id"))) {
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("production_record_id"))) {
|
|
|
@ -75,6 +77,7 @@ class MesToPiscesProductionAssembly {
|
|
|
|
if (!Objects.isNull(mesProductionRecord)) {
|
|
|
|
if (!Objects.isNull(mesProductionRecord)) {
|
|
|
|
rowMap.put("PRODUCTION_LOG_FID", mesProductionRecord.getFid())
|
|
|
|
rowMap.put("PRODUCTION_LOG_FID", mesProductionRecord.getFid())
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
rowMap.put("PRODUCTION_LOG_FID", null)
|
|
|
|
LOGGER.info("加工记录id:{},信息不存在", String.valueOf(rowMap.get("production_record_id")))
|
|
|
|
LOGGER.info("加工记录id:{},信息不存在", String.valueOf(rowMap.get("production_record_id")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
@ -86,6 +89,7 @@ class MesToPiscesProductionAssembly {
|
|
|
|
if (!Objects.isNull(mesEquipment)) {
|
|
|
|
if (!Objects.isNull(mesEquipment)) {
|
|
|
|
rowMap.put("EQUIPMENT_FID", mesEquipment.getFid())
|
|
|
|
rowMap.put("EQUIPMENT_FID", mesEquipment.getFid())
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
rowMap.put("EQUIPMENT_FID", null)
|
|
|
|
LOGGER.info("设备代码:{}信息不存在", String.valueOf(rowMap.get("equipment_code")))
|
|
|
|
LOGGER.info("设备代码:{}信息不存在", String.valueOf(rowMap.get("equipment_code")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|