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