diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java index 20083a9..78e1bfa 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java @@ -275,7 +275,7 @@ public class MesLoadingListService extends BaseMesService implem } MesLabelTemplate labelTemplate = labelTemplateService.getLabelTemplate(config.getCfgValue(), organizeCode); - if (StringUtils.isEmpty(labelTemplate.getMethodCode())) { + if (labelTemplate == null || StringUtils.isEmpty(labelTemplate.getMethodCode())) { MesException.throwBusiException("装车单打印模版[%s]未配置策略方法", config.getCfgValue()); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/loadingList/strategy/ChengDuLoadingListPrintStrategy.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/loadingList/strategy/ChengDuLoadingListPrintStrategy.java index 37c6c20..e3cd3ff 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/loadingList/strategy/ChengDuLoadingListPrintStrategy.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/loadingList/strategy/ChengDuLoadingListPrintStrategy.java @@ -100,7 +100,8 @@ public class ChengDuLoadingListPrintStrategy implements IPrintTemplateStrategySe if (sheetJis == null) { continue; } - detailPrintModel.setProductClass(detail.getShippingCode()); + detailPrintModel.setPartClass(sheetJis.getPartClassCode()); + detailPrintModel.setProductClass(sheetJis.getPartClassName()); detailPrintModel.setGoOutTime(sheetJis.getGoOutTime()); detailPrintModel.setGoToTime(sheetJis.getGoToTime()); @@ -110,7 +111,7 @@ public class ChengDuLoadingListPrintStrategy implements IPrintTemplateStrategySe if (shippingOrder == null) { continue; } - detailPrintModel.setPartClass(shippingOrder.getShippingGroupCode()); + detailPrintModel.setShippingCode(shippingOrder.getShippingCode()); double amount = 0; DdlPackBean shippingDetailPackBean = DdlPackBean.getDdlPackBean(organizeCode); @@ -125,7 +126,7 @@ public class ChengDuLoadingListPrintStrategy implements IPrintTemplateStrategySe model.getDetails().add(detailPrintModel); } if (!CollectionUtils.isEmpty(model.getDetails())) { - model.setShippingCount(model.getShippingCount()); + model.setShippingCount(model.getDetails().size()); double totalAmount = 0.0; String maxGoToTime = null; diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ChengDuLoadingListDetailPrintModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ChengDuLoadingListDetailPrintModel.java index 727e93b..fe1209f 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ChengDuLoadingListDetailPrintModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ChengDuLoadingListDetailPrintModel.java @@ -17,6 +17,9 @@ public class ChengDuLoadingListDetailPrintModel { @ApiModelProperty("序号") private Integer seqNo; + @ApiModelProperty("单号") + private String shippingCode; + @ApiModelProperty("最迟到达时间") private String goToTime;