diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java index 40d48a3..c48e243 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/ChengDuVolvoShippingPrintStrategyService.java @@ -118,10 +118,14 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat return null; } + String productionDate = ""; List rackIdList = new ArrayList<>(); for (MesCimVolvoJisRackIdDetail rackIdDetail : rackIdDetails) { if (rackIdDetail.getJisRackIdFid() != null && !rackIdList.contains(rackIdDetail.getJisRackIdFid())) { rackIdList.add(rackIdDetail.getJisRackIdFid()); + if (StringUtils.isEmpty(productionDate)) { + productionDate = rackIdDetail.getProductionDate(); + } } } DdlPackBean rackPackBean = DdlPackBean.getDdlPackBean(organizeCode); @@ -183,7 +187,7 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat model.setPackageId(rackId.getJisRackId()); model.setPackageBarCode(rackId.getJisRackId()); model.setProcess("LDJIS"); - model.setDate("P" + TimeTool.getDateTimeShort().substring(2)); + model.setDate("P" + (StringUtils.isEmpty(productionDate) ? "" : productionDate.substring(2, 8))); return model; }