|
|
|
@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackId;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.bean.edi.cd.MesCimVolvoJisRackIdDetail;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.model.ChengDuVolvoShippingPrintDetailModel;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.model.ChengDuVolvoShippingPrintModel;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
|
|
|
|
|
import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementDetailRepository;
|
|
|
|
@ -189,6 +190,25 @@ public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispat
|
|
|
|
|
model.setProcess("LDJIS");
|
|
|
|
|
model.setDate("P" + (StringUtils.isEmpty(productionDate) ? "" : productionDate.substring(2, 8)));
|
|
|
|
|
|
|
|
|
|
List<ChengDuVolvoShippingPrintDetailModel> detailModels = new ArrayList<>();
|
|
|
|
|
for (MesShippingOrderManagementDetail detail : shippingDetails) {
|
|
|
|
|
ChengDuVolvoShippingPrintDetailModel detailModel = new ChengDuVolvoShippingPrintDetailModel();
|
|
|
|
|
detailModel.setPartNo(detail.getPartNo());
|
|
|
|
|
detailModel.setPartName(detail.getPartName());
|
|
|
|
|
detailModel.setCustPartNo(detail.getCustPartNo());
|
|
|
|
|
if (!StringUtils.isEmpty(detail.getPartPosition())) {
|
|
|
|
|
String tmpPosition = detail.getPartPosition().substring(detail.getPartPosition().length() - 2);
|
|
|
|
|
StringBuilder splitPosition = new StringBuilder();
|
|
|
|
|
for (char c : tmpPosition.toCharArray()) {
|
|
|
|
|
if (Character.isDigit(c)) {
|
|
|
|
|
splitPosition.append(c);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
detailModel.setPartPosition(splitPosition.toString());
|
|
|
|
|
}
|
|
|
|
|
detailModels.add(detailModel);
|
|
|
|
|
}
|
|
|
|
|
model.setDetails(detailModels);
|
|
|
|
|
return model;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|