From a50664ac39e157a9497b4efa32151014d2692b0d Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 29 Jun 2022 17:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=A0=A1=E9=AA=8C=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=9C=9F=202022-06-29=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auditManagement/entity/AuthGroup.java     |  1 +
 .../service/impl/CRollinfoServiceImpl.java    | 35 ++++++++++++++-----
 .../purchaseorder/query/PRDetailQuery.java    |  4 +++
 .../auditManagement/AuthGroupMapper.xml       |  5 ++-
 .../mapper/grid/GridTableDefaultDao.xml       | 35 ++++++++++---------
 .../mapper/purchaseorder/PRDetailMapper.xml   |  6 ++++
 6 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/auditManagement/entity/AuthGroup.java b/src/main/java/com/gaotao/modules/auditManagement/entity/AuthGroup.java
index ed59ca9..6a1a5dd 100644
--- a/src/main/java/com/gaotao/modules/auditManagement/entity/AuthGroup.java
+++ b/src/main/java/com/gaotao/modules/auditManagement/entity/AuthGroup.java
@@ -26,5 +26,6 @@ public class AuthGroup  {
 	/** 邮件地址 */
 	private String groupEmailAddress;
 
+	private String roleDesc;
 
 }
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
index 44b3c9f..59b1850 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
@@ -698,21 +698,38 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
                 }
             }
         }
-        // 管控物料有效期   getExpireddate 存在 维护过有效期
-        if (cRollInfo.getExpireddate()!=null){
-            if (cRollInfo.getExpireddate().compareTo(new Date())<0){
-                return R.error("该卷已超过有效期");
-            }
-        }else {
-           // 没有维护过有效期 需要去无物料检测有效期
-            Part part = partService.getPart(cRollInfo.getPartno());
-            if ("Y".equals(part.getExpiredatecontrolflag())){
+
+        // 没有维护过有效期 需要去物料检测有效期
+        Part part = partService.getPart(cRollInfo.getPartno());
+        if ("Y".equals(part.getExpiredatecontrolflag())){
+            // 管控物料有效期   getExpireddate 存在 维护过有效期
+            if (cRollInfo.getExpireddate()!=null){
+                if (cRollInfo.getExpireddate().compareTo(new Date())<0){
+                    return R.error("该卷已超过有效期");
+                }
+            }else {
                 Date expDate = DateUtils.addDateDays(cRollInfo.getRolldate(), part.getToexpiredays().intValue());
                 if (expDate.compareTo(new Date())<0){
                     return R.error("该卷已超过有效期");
                 }
             }
         }
+        // 管控物料有效期   getExpireddate 存在 维护过有效期
+//        if (cRollInfo.getExpireddate()!=null){
+//            if (cRollInfo.getExpireddate().compareTo(new Date())<0){
+//                return R.error("该卷已超过有效期");
+//            }
+//        }
+//        else {
+//           // 没有维护过有效期 需要去无物料检测有效期
+//            Part part = partService.getPart(cRollInfo.getPartno());
+//            if ("Y".equals(part.getExpiredatecontrolflag())){
+//                Date expDate = DateUtils.addDateDays(cRollInfo.getRolldate(), part.getToexpiredays().intValue());
+//                if (expDate.compareTo(new Date())<0){
+//                    return R.error("该卷已超过有效期");
+//                }
+//            }
+//        }
         if (rollOutboundControl(cRollInfo)) {
             return R.error("该卷入库时间较新,请先使用较晚的卷");
         }
diff --git a/src/main/java/com/gaotao/modules/purchaseorder/query/PRDetailQuery.java b/src/main/java/com/gaotao/modules/purchaseorder/query/PRDetailQuery.java
index 10e29ba..526bb17 100644
--- a/src/main/java/com/gaotao/modules/purchaseorder/query/PRDetailQuery.java
+++ b/src/main/java/com/gaotao/modules/purchaseorder/query/PRDetailQuery.java
@@ -27,4 +27,8 @@ public class PRDetailQuery  extends PRDetail {
     private List<SysOssEntity> sysOssEntityList;
 
     private String fileType;
+
+    private String startDate;
+
+    private String endDate;
 }
diff --git a/src/main/resources/mapper/auditManagement/AuthGroupMapper.xml b/src/main/resources/mapper/auditManagement/AuthGroupMapper.xml
index 3ce991a..c52913d 100644
--- a/src/main/resources/mapper/auditManagement/AuthGroupMapper.xml
+++ b/src/main/resources/mapper/auditManagement/AuthGroupMapper.xml
@@ -11,6 +11,7 @@
     <result column="site" jdbcType="VARCHAR" property="site" />
     <result column="active" jdbcType="CHAR" property="active" />
     <result column="group_email_address" jdbcType="VARCHAR" property="groupEmailAddress" />
+    <result column="role_desc" jdbcType="VARCHAR" property="roleDesc" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -77,9 +78,11 @@
     </update>
   <select id="getAuthGroupList" resultMap="BaseResultMap">
         <!--@mbg.generated-->
-        select A.id,A.record_type_db,A.group_id,A.group_desc,A.site,A.group_email_address
+        select  b.role_desc,A.id,A.record_type_db,A.group_id,A.group_desc,A.site,A.group_email_address
         ,(case A.active when 'Y' then '启用' else '禁用' end) as active
         from auth_group A
+      LEFT JOIN business_role_list b ON
+      A.record_type_db = b.role_item_no
         <where>
             <if test="site != null and site != ''">
                 and site = #{site,jdbcType=VARCHAR}
diff --git a/src/main/resources/mapper/grid/GridTableDefaultDao.xml b/src/main/resources/mapper/grid/GridTableDefaultDao.xml
index 1abe6f3..32be0d5 100644
--- a/src/main/resources/mapper/grid/GridTableDefaultDao.xml
+++ b/src/main/resources/mapper/grid/GridTableDefaultDao.xml
@@ -15,34 +15,35 @@
     <select id="getTableDefaultListLanguage" resultType="com.gaotao.modules.grid.entity.GridTableDefault"
             parameterType="com.gaotao.modules.grid.query.GridTableDefaultQuery">
         SELECT gtd.table_id,
-               gtd.column_prop,
-               ISNULL(gtl.language_value, gtd.column_label) AS column_label,
-               gtd.column_hidden,
-               gtd.column_image,
-               gtd.column_sortable,
-               gtd.column_width,
-               gtd.fixed,
-               gtd.sort_lv,
-               gtd.status,
-               gtd.table_name,
-               gtd.function_id,
-               gtd.column_type
+        gtd.column_prop,
+        ISNULL(gtl.language_value, gtd.column_label) AS column_label,
+        gtd.column_hidden,
+        gtd.column_image,
+        gtd.column_sortable,
+        gtd.column_width,
+        gtd.fixed,
+        gtd.sort_lv,
+        gtd.status,
+        gtd.table_name,
+        gtd.function_id,
+        gtd.column_type,
+        gtd.align
         FROM grid_table_default gtd
-                 LEFT JOIN sys_object_language_others gtl
-                           ON (gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id
-                               AND gtd.function_id = gtl.function_id )
+        LEFT JOIN sys_object_language_others gtl
+        ON (gtd.table_id = gtl.table_id AND gtd.column_prop = gtl.object_id
+        AND gtd.function_id = gtl.function_id )
 
 
         <where>
             gtl.object_type='table' AND gtl.language_code = #{languageCode}
             <if test="tableId != null and tableId != ''">
-              and  gtd.table_id =  #{tableId,jdbcType=VARCHAR}
+                and gtd.table_id = #{tableId,jdbcType=VARCHAR}
             </if>
             <if test="objectType != null and objectType != ''">
                 and gtl.object_type = #{objectType,jdbcType=VARCHAR}
             </if>
             <if test="status != null and status != ''">
-                and gtd.status =  #{status,jdbcType=BOOLEAN}
+                and gtd.status = #{status,jdbcType=BOOLEAN}
             </if>
             <if test="functionId != null and functionId != ''">
                 and gtd.function_id = #{functionId,jdbcType=VARCHAR}
diff --git a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml b/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml
index 2b7fb88..a7a5397 100644
--- a/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml
+++ b/src/main/resources/mapper/purchaseorder/PRDetailMapper.xml
@@ -84,6 +84,12 @@
             <if test="param2.approveresult != null and param2.approveresult != ''">
                 and  B.ApproveResult = #{param2.approveresult,jdbcType=VARCHAR}
             </if>
+            <if test="param2.startDate != null and param2.startDate != ''">
+                and  B.EnterDate <![CDATA[ >= ]]> #{param2.startDate}
+            </if>
+            <if test="param2.endDate != null and param2.endDate != ''">
+                and  B.EnterDate <![CDATA[ <=]]> #{param2.endDate}
+            </if>
         </where>
         order by A.RequisitionNo desc
     </select>