From ec431379bebe2d0a47f524b7c44bccfdc5bed003 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 7 Mar 2023 15:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=B7=A5=E8=89=BA=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E5=8A=9F=E8=83=BD=202023=E5=B9=B43=E6=9C=887=E6=97=A5?=
 =?UTF-8?q?=20=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/BaseController.java       | 26 +++++++++++++++----
 .../gaotao/modules/base/dao/BaseMapper.java   | 11 ++++++++
 .../modules/base/service/BaseService.java     | 10 +++++++
 .../base/service/Impl/BaseServiceImpl.java    |  5 ++++
 src/main/resources/mapper/base/BaseMapper.xml |  4 +++
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/base/controller/BaseController.java b/src/main/java/com/gaotao/modules/base/controller/BaseController.java
index 618ddcd..66b999e 100644
--- a/src/main/java/com/gaotao/modules/base/controller/BaseController.java
+++ b/src/main/java/com/gaotao/modules/base/controller/BaseController.java
@@ -1233,6 +1233,20 @@ public class BaseController extends AbstractController {
         return responseData;
     }
 
+    /**
+     * @param [inData]
+     * @author: sxm
+     * @description: 获取物料工序最大工序编号
+     * @return: com.gaotao.common.utils.R
+     * @date: 2023/3/7 11:55
+     */
+    @PostMapping("getPartNoRouteInMaxItemNo")
+    @ResponseBody
+    public R getPartNoRouteInMaxItemNo(@RequestBody RoutingDetailData inData) {
+        String maxItemNo = baseService.getPartNoRouteInMaxItemNo(inData);
+        return R.ok().put("data", maxItemNo);
+    }
+
     /**
      * @return {@link Object}
      * @Title deleteRoutingDetail
@@ -1852,9 +1866,9 @@ public class BaseController extends AbstractController {
 
 
     /**
-     * @author: sxm
-     * @description:  获取选中班次类型 默认信息
      * @param [calendarData]
+     * @author: sxm
+     * @description: 获取选中班次类型 默认信息
      * @return: com.gaotao.common.utils.R
      * @date: 2022/10/21 10:06
      */
@@ -1866,16 +1880,18 @@ public class BaseController extends AbstractController {
     }
 
     /**
+     * @param [calendarExceptionData]
      * @author: sxm
      * @description: 修改班次信息
-     * @param [calendarExceptionData]
      * @return: com.gaotao.common.utils.R
      * @date: 2022/10/21 10:27
      */
     @PostMapping("/updateWorkingCalendar")
     @ResponseBody
-    public R updateWorkingCalendar(@RequestBody CalendarExceptionData  calendarExceptionData) {
-         baseService.updateWorkingCalendar(calendarExceptionData);
+    public R updateWorkingCalendar(@RequestBody CalendarExceptionData calendarExceptionData) {
+        baseService.updateWorkingCalendar(calendarExceptionData);
         return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
     }
+
+
 }
diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
index f4f4806..439532c 100644
--- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
+++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
@@ -1946,4 +1946,15 @@ public interface BaseMapper {
      */
 
     void deleteCalendarExceptionShift(CalendarExceptionData data);
+
+
+    /**
+     * @author: sxm
+     * @description: 获取物料最大工序
+     * @param [inData]
+     * @return: java.lang.String
+     * @date: 2023/3/7 13:05
+     */
+    String getPartNoRouteInMaxItemNo(RoutingDetailData inData);
+
 }
diff --git a/src/main/java/com/gaotao/modules/base/service/BaseService.java b/src/main/java/com/gaotao/modules/base/service/BaseService.java
index 47381e4..e810bb1 100644
--- a/src/main/java/com/gaotao/modules/base/service/BaseService.java
+++ b/src/main/java/com/gaotao/modules/base/service/BaseService.java
@@ -1194,4 +1194,14 @@ public interface BaseService {
     * @version 1.0
     */
     void deleteLabelSerialInfo(LabelContentSerialInfoData inData);
+
+    /**
+     * @author: sxm
+     * @description: 获取物料工序最大工序编号
+     * @param [inData]
+     * @return: java.lang.String
+     * @date: 2023/3/7 13:04
+     */
+    String getPartNoRouteInMaxItemNo(RoutingDetailData inData);
+
 }
diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
index 9b8bb9d..d203c4a 100644
--- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
@@ -2756,4 +2756,9 @@ public class BaseServiceImpl implements BaseService {
         //删除标签流水号信息
         baseMapper.deleteLabelSerialInfo(inData);
     }
+
+    @Override
+    public String getPartNoRouteInMaxItemNo(RoutingDetailData inData) {
+        return baseMapper.getPartNoRouteInMaxItemNo(inData);
+    }
 }
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 313997f..cd324c0 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -2125,6 +2125,10 @@
             AND rcs.ReportID = #{labelNo} AND rcs.ItemNo = #{itemNo}
         </where>
     </select>
+    <select id="getPartNoRouteInMaxItemNo" resultType="java.lang.String">
+        SELECT MAX(ItemNo) FROM RoutingDetail
+        WHERE site =#{site} AND partNo = #{partNo} AND revNo = #{revNo}
+    </select>
 
     <!--插入标签流水号信息-->
     <insert id="insertLabelSerialInfo" parameterType="LabelContentSerialInfoData">