电子化检验弹框数据处理

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionCutOrderDialogPrintService.java

@@ -4,23 +4,18 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepSer
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderCutService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesPartContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesWorkOrderCutDetailModel;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseSwsService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IShippingDispatchService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.function.IFsmModuleFunctionService;
 import cn.estsh.i3plus.platform.common.util.MesPcnConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupDetailCfg;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutSchemeFg;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
 import cn.estsh.i3plus.pojo.mes.model.ButtonDynamicModel;
+import cn.estsh.i3plus.pojo.mes.model.StationCustomDialogBean;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
 import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
-import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeFgRepository;
 import com.alibaba.fastjson.JSONObject;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,19 +25,15 @@ import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
- * @Description : 工位参数按钮事件接口实现【裁片工单打印弹框】
+ * @Description : 裁片工单弹框接口实现【裁片工单打印弹框】
  **/
 @Service
 @Slf4j
 public class MesFunctionCutOrderDialogPrintService extends BaseSwsService implements IFsmModuleFunctionService {
 
     @Autowired
-    private IMesProductionProcessContextStepService productionProcessContextStepService;
-
-    @Autowired
     private IMesProductionDispatchContextStepService productionDispatchContextStepService;
 
     @Autowired
@@ -80,7 +71,7 @@ public class MesFunctionCutOrderDialogPrintService extends BaseSwsService implem
     }
 
     @Override
-    public Object stepDialogDispatch(StationRequestBean reqBean) {
+    public StationCustomDialogBean stepDialogDispatch(StationRequestBean reqBean, StationCustomDialogBean dialogBean) {
 
         List<MesWorkOrderCutDetailModel> mesWorkOrderCutFgDataContextList = productionDispatchContextStepService.getMesWorkOrderCutFgDataContext(reqBean);
 
@@ -107,7 +98,6 @@ public class MesFunctionCutOrderDialogPrintService extends BaseSwsService implem
 
         }
 
-        // 成品列表为空则表示不需要弹框
-        return CollectionUtils.isEmpty(mesWorkOrderCutFgDataContextList) ? null :mesWorkOrderCutFgDataContextList;
+        return CollectionUtils.isEmpty(mesWorkOrderCutFgDataContextList) ? dialogBean.unDialog() : dialogBean.obj(mesWorkOrderCutFgDataContextList);
     }
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionElectronicInspectionService.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station.function;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsInContext;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseSwsService;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.function.IFsmModuleFunctionService;
+import cn.estsh.i3plus.pojo.mes.model.StationCustomDialogBean;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description : 电子化检验弹框接口实现【电子化检验弹框】
+ **/
+@Service
+@Slf4j
+public class MesFunctionElectronicInspectionService extends BaseSwsService implements IFsmModuleFunctionService {
+
+    @Autowired
+    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
+
+    @Override
+    public StationCustomDialogBean stepDialogDispatch(StationRequestBean reqBean, StationCustomDialogBean dialogBean) {
+
+        List<MesProductionPsInContext> productionPsInContext = productionDispatchContextStepService.getProductionPsInContext(reqBean);
+
+        // 如果当前存在进料条码列表则返回条码集合
+        if (!CollectionUtils.isEmpty(productionPsInContext)) {
+
+            List<String> snList = productionPsInContext.stream().filter(o -> StringUtils.isEmpty(o.getProductSn())).map(MesProductionPsInContext::getProductSn).distinct().collect(Collectors.toList());
+            // 条码列表为空则表示不需要弹框
+            if (CollectionUtils.isEmpty(snList)) return dialogBean.unDialog();
+            else dialogBean.asyn().obj(snList);
+        }
+
+        return dialogBean.unDialog();
+    }
+}