Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into dev

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdRuleIgnoreCfgService.java

@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleIgnoreCfg;
+
+public interface IMesProdRuleIgnoreCfgService extends IBaseMesService<MesProdRuleIgnoreCfg> {
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleIgnoreCfg;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "产品加工不可用规则配置")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesProdRuleIgnoreCfg")
+public class MesProdRuleIgnoreCfgController extends BaseMesController<MesProdRuleIgnoreCfg> {
+}

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesProdRuleIgnoreCfgService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesCarSeriesLoosePart;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleIgnoreCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesProdRuleIgnoreCfgServiceImpl extends BaseMesService<MesProdRuleIgnoreCfg> implements IMesProdRuleIgnoreCfgService {
+
+    @Override
+    protected void setPackQueryBean(MesProdRuleIgnoreCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getNumEqualPack(bean.getSourceId(),"sourceId",packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getDataSource(),"dataSource",packBean);
+    }
+}