|
|
@ -116,8 +116,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
|
|
|
|
//查询产品信息
|
|
|
|
//查询产品信息
|
|
|
|
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
|
|
|
|
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
|
|
|
|
|
|
|
|
|
|
|
|
String udiCode = "#" + udiProductEntity.getNameCode() + "#" + udiProductEntity.getProduceDate() + "#" + udiProductEntity.getExpireDate() +
|
|
|
|
String udiCode = "#" + udiProductEntity.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
|
|
|
|
"#" + udiProductEntity.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
|
|
|
|
"#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
|
|
|
|
udiCode = udiCode.replaceAll("#null","");
|
|
|
|
udiCode = udiCode.replaceAll("#null","");
|
|
|
|
innerOrderPrintEntity.setUdiCode(udiCode);
|
|
|
|
innerOrderPrintEntity.setUdiCode(udiCode);
|
|
|
|
invInnerOrderPrintDao.insert(innerOrderPrintEntity);
|
|
|
|
invInnerOrderPrintDao.insert(innerOrderPrintEntity);
|
|
|
@ -277,8 +277,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
|
|
|
|
//查询产品信息
|
|
|
|
//查询产品信息
|
|
|
|
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
|
|
|
|
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
|
|
|
|
|
|
|
|
|
|
|
|
String udiCode = "#" + udiProductEntity.getNameCode() + "#" + udiProductEntity.getProduceDate() + "#" + udiProductEntity.getExpireDate() +
|
|
|
|
String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
|
|
|
|
"#" + udiProductEntity.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
|
|
|
|
"#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
|
|
|
|
udiCode = udiCode.replaceAll("#null","");
|
|
|
|
udiCode = udiCode.replaceAll("#null","");
|
|
|
|
innerOrderPrintEntity.setUdiCode(udiCode);
|
|
|
|
innerOrderPrintEntity.setUdiCode(udiCode);
|
|
|
|
invInnerOrderPrintDao.insert(innerOrderPrintEntity);
|
|
|
|
invInnerOrderPrintDao.insert(innerOrderPrintEntity);
|
|
|
|