装配目视单预览问题修复

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java

@@ -7,17 +7,14 @@ import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel.MesExcelTool;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.mes.apiservice.util.DateUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
-import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesConfig;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesProductVersion;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderModel;
-import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.i3plus.pojo.model.wms.WmsProductModel;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -30,15 +27,12 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 @Api(description = "工单主页面")
 @RestController
@@ -221,11 +215,13 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
     public ResultBean doShowWorkOrderPrint(String partNo, String workCenterCode, String partProdGroupCode, String carModelCode, String organizeCode, String userName ) {
         try {
 
-            ValidatorBean.checkNotNull(partNo, "零件号不能为空");
             ValidatorBean.checkNotNull(workCenterCode, "产线不能为空");
             ValidatorBean.checkNotNull(partProdGroupCode, "生产组代码不能为空");
             ValidatorBean.checkNotNull(organizeCode, "工厂代码不能为空");
             ValidatorBean.checkNotNull(userName, "操作人不能为空");
+            if (StringUtil.isEmpty(partNo) && StringUtil.isEmpty(carModelCode)) {
+                MesException.throwMesBusiException("物料号和车型代码不能同时为空");
+            }
 
             return ResultBean.success("装配目视单预览查询成功")
                     .setResultList(mesWorkOrderService.doShowWorkOrderPrint(partNo, workCenterCode, partProdGroupCode, carModelCode, organizeCode, userName))

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -1255,11 +1255,11 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         // 根据id 获取工单数据
         List<MesWorkOrder> mesWorkOrderList = getMesWorkOrderList(ids, organizeCode);
 
-        return packPrintResultMap(organizeCode, mesWorkOrderList, userName);
+        return packPrintResultMap(organizeCode, mesWorkOrderList, userName,false);
 
     }
 
-    private List<Map<String, Object>> packPrintResultMap(String organizeCode, List<MesWorkOrder> mesWorkOrderList, String userName) {
+    private List<Map<String, Object>> packPrintResultMap(String organizeCode, List<MesWorkOrder> mesWorkOrderList, String userName,Boolean isShow) {
         // 根据工单号对工单分组
         Map<String, MesWorkOrder> workOrderMapByWorkOrderNo = mesWorkOrderList.stream().collect(Collectors.toMap(MesWorkOrder::getWorkOrderNo, Function.identity(), (x, y) -> y));
 
@@ -1311,7 +1311,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 MesException.throwMesBusiException("工单【%s】关联零件生产组【%s】打印模板为空", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getPartProdGroupCode());
             }
 
-            MesLabelTemplate labelTemplate = labelTemplateService.getLabelTemplate(printTemplate, organizeCode);
+            MesLabelTemplate labelTemplate = labelTemplateService.getLabelTemplate(isShow ? printTemplate + "_SHOW" : printTemplate, organizeCode);
             //模板信息丢失抛出异常
             if (Objects.isNull(labelTemplate) || StringUtils.isEmpty(labelTemplate.getMethodCode())) {
                 MesException.throwMesBusiException("工单【%s】关联零件生产组【%s】打印模板【%s】为空", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getPartProdGroupCode(), labelTemplate.getTemplateCode());
@@ -1379,7 +1379,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         List<MesWorkOrder> workOrderList = new ArrayList<>();
         workOrderList.add(workOrder);
 
-        return packPrintResultMap(organizeCode, workOrderList, userName);
+        return packPrintResultMap(organizeCode, workOrderList, userName,true);
     }
 
     private Map<String, MesCustomerCarModel> getMesCustomerCarModelMap(String organizeCode, List<MesWorkOrder> workOrderList) {