From f8e40a535de3364bf9789bf50658fc9235d8fbe7 Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Fri, 31 May 2024 11:49:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=A7=E7=BA=BF=E5=92=8C?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=E6=9F=A5=E5=8D=95=E4=B8=AA=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E7=8F=AD=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/api/base/IMesProdShiftRecordService.java   |  2 ++
 .../base/MesProdShiftRecordController.java         | 29 ++++++++++++++++++++++
 .../base/MesProdShiftRecordServiceImpl.java        | 17 ++++++++++---
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java
index 916441d..c991c58 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProdShiftRecordService.java
@@ -10,4 +10,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord;
  * @Modify:
  */
 public interface IMesProdShiftRecordService extends IBaseMesService<MesProdShiftRecord> {
+
+    MesProdShiftRecord queryMesProdShiftRecord(MesProdShiftRecord mesProdShiftRecord);
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java
index 5328f7f..8508813 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesProdShiftRecordController.java
@@ -1,10 +1,20 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesProdShiftRecordService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 开关班记录
  * @Author: gsz
@@ -14,4 +24,23 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesProdShiftRecord")
 public class MesProdShiftRecordController extends BaseMesController<MesProdShiftRecord>{
+
+    @Autowired
+    private IMesProdShiftRecordService prodShiftRecordService;
+
+    @GetMapping(value = "/query-prod-shift-record")
+    @ApiOperation(value = "查询零件生产组")
+    public ResultBean queryMesProdShiftRecord(MesProdShiftRecord mesProdShiftRecord) {
+        try {
+            mesProdShiftRecord.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+            //查询汇总工单数量
+            MesProdShiftRecord mesPartProdGroup= prodShiftRecordService.queryMesProdShiftRecord(mesProdShiftRecord);
+            return ResultBean.success("查询成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(mesPartProdGroup);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e).build();
+        } catch (Exception e) {
+            return ResultBean.fail(e);
+        }
+    }
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java
index 86c4417..e540958 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java
@@ -8,10 +8,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesCcscTask;
-import cn.estsh.i3plus.pojo.mes.bean.MesEnumDetail;
-import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -34,6 +31,7 @@ public class MesProdShiftRecordServiceImpl extends BaseMesService<MesProdShiftRe
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShiftCode(), "shiftCode", packBean);
+        packBean.setOrderByStr(bean.orderBy());
     }
     @Override
     public MesProdShiftRecord insert(MesProdShiftRecord item) {
@@ -44,6 +42,17 @@ public class MesProdShiftRecordServiceImpl extends BaseMesService<MesProdShiftRe
         }
         return baseRDao.insert(item);
     }
+
+    @Override
+    public MesProdShiftRecord queryMesProdShiftRecord(MesProdShiftRecord bean) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
+        packBean.setOrderByStr(bean.orderBy());
+
+        return baseRDao.getByProperty(packBean);
+    }
+
     @Override
     protected void onInsertBean(MesProdShiftRecord item) {
         // 数据校验