Merge branch 'uat-temp-wj-20241223-44377' into test

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.ext.mes.api.base;
+package cn.estsh.i3plus.ext.mes.api.busi.report;
 
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
+import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.impp.framework.base.controller.BaseController;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api("加工记录合并批量汇报查询报表")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN)
+public class MesInspectionProductDataReportController extends BaseController {
+
+    @GetMapping(value = "/inspection-product-data-amount/report/query")
+    @ApiOperation(value = "加工记录合并批量汇报查询报表")
+    public ResultBean queryInspectionProductDataAmountReport(MesProductionRecordReportExtModel model, Pager pager) {
+        try {
+            ValidatorBean.beginValid(model)
+                    .notNull(MesExtConstWords.COMPLETE_DATE_TIME_START, model.getCompleteDateTimeStart())
+                    .notNull(MesExtConstWords.COMPLETE_DATE_TIME_END, model.getCompleteDateTimeEnd());
+            model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
+            return ResultBean.success("查询成功").setListPager(null)
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesProductionRecordReportExtController.java

@@ -1,6 +1,6 @@
-package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesProductionRecordReportExtService;
+import cn.estsh.i3plus.ext.mes.api.busi.report.IMesProductionRecordReportExtService;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
@@ -34,7 +34,7 @@ public class MesProductionRecordReportExtController extends BaseController {
             ValidatorBean.beginValid(model)
                     .notNull(MesExtConstWords.COMPLETE_DATE_TIME_START, model.getCompleteDateTimeStart())
                     .notNull(MesExtConstWords.COMPLETE_DATE_TIME_END, model.getCompleteDateTimeEnd());
-//            model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
+            model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             return ResultBean.success("查询成功").setListPager(productionRecordReportExtService.queryProductionRecordUnionWorkOrderLogReport(model, pager))
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesProductionRecordReportExtService.java

@@ -1,6 +1,6 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesProductionRecordReportExtService;
+import cn.estsh.i3plus.ext.mes.api.busi.report.IMesProductionRecordReportExtService;
 import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesProductionRecordReportExtDao;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;