|
|
@ -49,6 +49,8 @@ class MesToPiscesProductionAssembly {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("assembly_sn")))
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("assembly_sn")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
rowMap.put("ASSEMBLY_BARCODE_ID", null)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//条码
|
|
|
|
//条码
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("product_sn"))) {
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("product_sn"))) {
|
|
|
@ -58,6 +60,8 @@ class MesToPiscesProductionAssembly {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("product_sn")))
|
|
|
|
LOGGER.info("条码:{}信息不存在", String.valueOf(rowMap.get("product_sn")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
rowMap.put("BARCODE_ID", null)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//加工记录表
|
|
|
|
//加工记录表
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("production_record_id"))) {
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("production_record_id"))) {
|
|
|
@ -71,6 +75,8 @@ class MesToPiscesProductionAssembly {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
LOGGER.info("原材料容器id:{},信息不存在", String.valueOf(rowMap.get(rowMap.get("production_record_id"))))
|
|
|
|
LOGGER.info("原材料容器id:{},信息不存在", String.valueOf(rowMap.get(rowMap.get("production_record_id"))))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
rowMap.put("PRODUCTION_LOG_FID", null)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//获取设备FID
|
|
|
|
//获取设备FID
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("equipment_code"))) {
|
|
|
|
if (!StringUtils.isEmpty(rowMap.get("equipment_code"))) {
|
|
|
@ -78,8 +84,10 @@ class MesToPiscesProductionAssembly {
|
|
|
|
if (!Objects.isNull(mesEquipment)) {
|
|
|
|
if (!Objects.isNull(mesEquipment)) {
|
|
|
|
rowMap.put("EQUIPMENT_FID", mesEquipment.getFid())
|
|
|
|
rowMap.put("EQUIPMENT_FID", mesEquipment.getFid())
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
LOGGER.info("设备代码:{}信息不存在", String.valueOf(rowMap.get("EQUIPMENT_FID")))
|
|
|
|
LOGGER.info("设备代码:{}信息不存在", String.valueOf(rowMap.get("equipment_code")))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
rowMap.put("EQUIPMENT_FID", null)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return srcData;
|
|
|
|
return srcData;
|
|
|
|