42102 点检单页面增加打印功能

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IMesSpotCheckOrderService.java

@@ -18,5 +18,6 @@ public interface IMesSpotCheckOrderService extends IBaseMesService<MesSpotCheckO
     @ApiOperation("生成点检单")
     void insertMesSpotCheckOrder(List<MesEquipmentSpotCheck> mesEquipmentSpotCheckList, String userName);
 
-
+    @ApiOperation("点检单结果打印")
+    MesSpotCheckOrder queryMesSpotCheckOrderResultPrint(MesSpotCheckOrder mesSpotCheckOrder);
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderController.java

@@ -1,9 +1,19 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.busi;
 
+import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderService;
 import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrder;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,4 +23,29 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesSpotCheckOrder")
 public class MesSpotCheckOrderController extends BaseMesController<MesSpotCheckOrder> {
 
+    @Autowired
+    private IMesSpotCheckOrderService mesSpotCheckOrderService;
+
+    @PostMapping(value = "/qc-print")
+    @ApiOperation(value = "点检单结果打印")
+    public ResultBean queryMesSpotCheckOrderResultPrint(@RequestBody MesSpotCheckOrder mesSpotCheckOrder) {
+        try {
+            if (mesSpotCheckOrder == null) {
+                return ResultBean.success();
+            }
+            //条件验证
+            ValidatorBean.beginValid(mesSpotCheckOrder)
+                    .notNull("spotCheckId", mesSpotCheckOrder.getSpotCheckId())
+                    .notNull("spotCheckOrderNo", mesSpotCheckOrder.getSpotCheckOrderNo())
+                    .notNull("organizeCode", mesSpotCheckOrder.getOrganizeCode());
+
+            return ResultBean.success("点检单结果打印成功")
+                    .setResultObject(mesSpotCheckOrderService.queryMesSpotCheckOrderResultPrint(mesSpotCheckOrder))
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException imppException) {
+            return ResultBean.fail(imppException);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentSpotCheckService;
 import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderPartService;
 import cn.estsh.i3plus.ext.mes.api.busi.IMesSpotCheckOrderResultService;
@@ -65,6 +66,9 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
     private ISyncFuncService syncFuncService;
     @Autowired
     private ICoreUtilCloud sysOrderNoRuleCloud;
+
+    @Autowired
+    private IMesConfigService mesConfigService;
     @Override
     public MesSpotCheckOrder insert(MesSpotCheckOrder bean) {
         onInsertBean(bean);
@@ -552,4 +556,16 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
         }
         return spotCheckOrderMap;
     }
+
+    @Override
+    public MesSpotCheckOrder queryMesSpotCheckOrderResultPrint(MesSpotCheckOrder mesSpotCheckOrder) {
+        //获取点检方案明细
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesSpotCheckOrder.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(mesSpotCheckOrder.getId(), "pid", packBean);
+        List<MesSpotCheckOrderResult> detailList = spotCheckOrderResultRepository.findByHqlWhere(packBean);
+        mesSpotCheckOrder.setCheckOrderResults(detailList);
+
+        mesSpotCheckOrder.setTemplateNo(mesConfigService.getCfgValue(mesSpotCheckOrder.getOrganizeCode(), MesCommonConstant.QC_ORDER_PRINT_TEMPLATE) );
+        return mesSpotCheckOrder;
+    }
 }

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java

@@ -57,4 +57,5 @@ public class MesCommonConstant {
     //OPC注册ID
     public static final String CLIENT_HANDLE_ID = "CLIENT_HANDLE_ID";
 
+    public static final String QC_ORDER_PRINT_TEMPLATE = "QC_ORDER_PRINT_TEMPLATE";
 }