|
|
@ -216,19 +216,19 @@ public class PackagesplitMainController { |
|
|
|
packageoverDetailPageReqVO.setProductionLine(productionLine); |
|
|
|
} |
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); |
|
|
|
// if (packageDO.getDeliveryDate() != null && StringUtils.isEmpty(requestNumber)) {
|
|
|
|
// purchasePrintVO.setStoolTime(packageDO.getDeliveryDate().format(formatter) + "-" + packageDO.getStoolTime());
|
|
|
|
// }
|
|
|
|
if (packageDO.getDeliveryDate() != null) { |
|
|
|
packageoverDetailPageReqVO.setDeliveryDateView(packageDO.getDeliveryDate().format(formatter)); |
|
|
|
} |
|
|
|
if (packageDO.getStoolTime() != null) { |
|
|
|
if(packageDO.getStoolTime().length() == 1){ |
|
|
|
packageoverDetailPageReqVO.setStoolTime("- "+"0"+packageDO.getStoolTime()); |
|
|
|
}else { |
|
|
|
packageoverDetailPageReqVO.setStoolTime("- "+packageDO.getStoolTime()); |
|
|
|
if (packageoverDetailPageReqVO.getStoolTime() != null) { |
|
|
|
if (packageDO.getStoolTime() != null) { |
|
|
|
if(packageDO.getStoolTime().length() == 1){ |
|
|
|
packageoverDetailPageReqVO.setStoolTime("- "+"0"+packageDO.getStoolTime()); |
|
|
|
}else { |
|
|
|
packageoverDetailPageReqVO.setStoolTime("- "+packageDO.getStoolTime()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
packageoverDetailPageReqVO.setRelateNumber(packageDO.getNumber().substring(packageDO.getNumber().length() - 5)); |
|
|
|
packageoverDetailPageReqVOList.add(packageoverDetailPageReqVO); |
|
|
|
} |
|
|
|
return success(packageoverDetailPageReqVOList); |
|
|
|