合并代码

uat-temp-wj-chongqingdaqu-prod-huaweiyun-temp
王杰 3 months ago
parent a1c552ed75
commit 0dc2272806

@ -118,10 +118,14 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat
return null; return null;
} }
String productionDate = "";
List<Long> rackIdList = new ArrayList<>(); List<Long> rackIdList = new ArrayList<>();
for (MesCimVolvoJisRackIdDetail rackIdDetail : rackIdDetails) { for (MesCimVolvoJisRackIdDetail rackIdDetail : rackIdDetails) {
if (rackIdDetail.getJisRackIdFid() != null && !rackIdList.contains(rackIdDetail.getJisRackIdFid())) { if (rackIdDetail.getJisRackIdFid() != null && !rackIdList.contains(rackIdDetail.getJisRackIdFid())) {
rackIdList.add(rackIdDetail.getJisRackIdFid()); rackIdList.add(rackIdDetail.getJisRackIdFid());
if (StringUtils.isEmpty(productionDate)) {
productionDate = rackIdDetail.getProductionDate();
}
} }
} }
DdlPackBean rackPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean rackPackBean = DdlPackBean.getDdlPackBean(organizeCode);
@ -183,6 +187,7 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat
model.setPackageId(rackId.getJisRackId()); model.setPackageId(rackId.getJisRackId());
model.setPackageBarCode(rackId.getJisRackId()); model.setPackageBarCode(rackId.getJisRackId());
model.setProcess("LDJIS"); model.setProcess("LDJIS");
model.setDate("P" + (StringUtils.isEmpty(productionDate) ? "" : productionDate.substring(2, 8)));
return model; return model;
} }

Loading…
Cancel
Save