This commit is contained in:
王奎兴
2026-05-30 16:17:53 +08:00
parent 4a531b536d
commit 1bb9401546
@@ -519,34 +519,35 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
for (MaterialMoreDetailDO materialMoreDetailDO : materialMoreDetailList) {
String attributeValue = materialMoreDetailDO.getAttributeValue();
String batchLabels = materialMoreDetailDO.getBatchLabels();
if ("生产日期".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
}
receiptMaterialDetailDO.setProductionDate(date);
} else if ("过期日期".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
}
receiptMaterialDetailDO.setExpiryDate(date);
} else if ("扩展属性4".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
}
//receiptMaterialDetailDO.setExtAttr4(date);
} else if ("饮用日期".equals(batchLabels)) {
if (attributeValue != null && batchLabels != null) {
if ("生产日期".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
}
receiptMaterialDetailDO.setProductionDate(date);
} else if ("过期日期".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
}
receiptMaterialDetailDO.setExpiryDate(date);
} else if ("扩展属性4".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
}
//receiptMaterialDetailDO.setExtAttr4(date);
} else if ("饮用日期".equals(batchLabels)) {
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// Date date = null;
// try {
@@ -555,25 +556,26 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
// throw new RuntimeException(e);
// }
// receiptMaterialDetailDO.setInventoryDate(date);
} else if ("扩展属性2".equals(batchLabels)) {
receiptMaterialDetailDO.setExtAttr2(attributeValue);
} else if ("扩展属性1".equals(batchLabels)) {
receiptMaterialDetailDO.setExtAttr1(attributeValue);
} else if ("箱号/卡板号".equals(batchLabels)) {
receiptMaterialDetailDO.setBoxPalletNo(attributeValue);
} else if ("Sheet Ref NO's".equals(batchLabels)) {
receiptMaterialDetailDO.setSheetRefNo(attributeValue);
} else if ("Batch Ref NO's".equals(batchLabels)) {
receiptMaterialDetailDO.setBatchRefNo(attributeValue);
} else if ("存货日期".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
} else if ("扩展属性2".equals(batchLabels)) {
receiptMaterialDetailDO.setExtAttr2(attributeValue);
} else if ("扩展属性1".equals(batchLabels)) {
receiptMaterialDetailDO.setExtAttr1(attributeValue);
} else if ("箱号/卡板号".equals(batchLabels)) {
receiptMaterialDetailDO.setBoxPalletNo(attributeValue);
} else if ("Sheet Ref NO's".equals(batchLabels)) {
receiptMaterialDetailDO.setSheetRefNo(attributeValue);
} else if ("Batch Ref NO's".equals(batchLabels)) {
receiptMaterialDetailDO.setBatchRefNo(attributeValue);
} else if ("存货日期".equals(batchLabels)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = null;
try {
date = sdf.parse(attributeValue);
} catch (ParseException e) {
throw new RuntimeException(e);
}
receiptMaterialDetailDO.setInventoryDate(date);
}
receiptMaterialDetailDO.setInventoryDate(date);
}
}
}