新品流程ok

src/main/java/com/xujie/modules/order/support/PoDetailAdvancedQuerySupport.java

@@ -75,7 +75,7 @@ public final class PoDetailAdvancedQuerySupport {
         map.put("advancePayment", new FieldMeta("pod.c_advance_payment", "string"));
         map.put("advancePaid", new FieldMeta("pod.c_advance_paid", "string"));
         map.put("createTime", new FieldMeta("pod.create_time", "date"));
-        map.put("planner", new FieldMeta("pod.c_planner", "string"));
+        map.put("planner", new FieldMeta("ISNULL(suPlanner.user_display, poh.c_planner)", "string"));
         map.put("edit", new FieldMeta("pod.c_edit", "string"));
         map.put("endPlanner", new FieldMeta("pod.c_end_planner", "string"));
         map.put("remarkDelay", new FieldMeta("pod.c_remark_delay", "string"));

src/main/java/com/xujie/modules/order/support/PoFieldAuthSupport.java

@@ -228,7 +228,7 @@ public class PoFieldAuthSupport {
                 rawValue = PoOrderTypeSupport.normalizeOrderTypeFilter(rawValue);
             }
             ValidatedQueryCondition validated = new ValidatedQueryCondition();
-            validated.setSqlExpression(meta.getQuerySqlExpr());
+            validated.setSqlExpression(resolveQuerySqlExpr(meta));
             validated.setOperator(operator);
             validated.setValue(rawValue);
             validated.setDataType(meta.getQueryDataType());
@@ -435,6 +435,16 @@ public class PoFieldAuthSupport {
         return StringUtils.hasText(meta.getDictType()) ? meta.getDictType().trim() : null;
     }
 
+    private String resolveQuerySqlExpr(PoFieldMeta meta) {
+        if (meta == null || !StringUtils.hasText(meta.getQuerySqlExpr())) {
+            return meta == null ? null : meta.getQuerySqlExpr();
+        }
+        if ("planner".equals(normalizeFieldCode(meta.getFieldCode()))) {
+            return "ISNULL(suPlanner.user_display, poh.c_planner)";
+        }
+        return meta.getQuerySqlExpr();
+    }
+
     private String resolveExtEditorType(String dataType, String dictType) {
         if (StringUtils.hasText(dictType)) {
             return "dict-select";

src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml

@@ -29,7 +29,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
-        h.site, h.request_no, h.request_date, h.need_inspect_date, h.supplier_no, h.planner, h.create_by, h.create_date, h.inspect_address, h.inspect_contract, h.remark, h.status, h.status_db, h.qc_operator, h.inspect_date, h.plan_start_date, h.plan_end_date, h.scheduled_date, h.scheduled_by, h.schedule_remark, s.supplier_name
+        h.site, h.request_no, h.request_date, h.need_inspect_date, h.supplier_no, ISNULL(dbo.plm_get_user_display(h.site, h.planner), h.planner) AS planner, h.create_by, h.create_date, h.inspect_address, h.inspect_contract, h.remark, h.status, h.status_db, h.qc_operator, h.inspect_date, h.plan_start_date, h.plan_end_date, h.scheduled_date, h.scheduled_by, h.schedule_remark, s.supplier_name
     </sql>
 
     <select id="myPage" resultType="com.xujie.modules.inspection.entity.InspectionRequestHeader">
@@ -42,7 +42,10 @@
             <if test="query.requestNo != null and query.requestNo != '' "> and h.request_no like '%${query.requestNo}%'</if>
             <if test="query.supplierNo != null and query.supplierNo != '' "> and h.supplier_no like '%${query.supplierNo}%'</if>
             <if test="query.supplierName != null and query.supplierName != '' "> and s.supplier_name like '%${query.supplierName}%'</if>
-            <if test="query.planner != null and query.planner != '' "> and h.planner like '%${query.planner}%'</if>
+            <if test="query.planner != null and query.planner != '' ">
+                and (h.planner like '%${query.planner}%'
+                or ISNULL(dbo.plm_get_user_display(h.site, h.planner), '') like '%${query.planner}%')
+            </if>
             <if test="query.status == 'NON_DRAFT'"> and h.status_db != 'Draft'</if>
             <if test="query.status != null and query.status != '' and query.status != 'NON_DRAFT' "> and h.status_db = #{query.status}</if>
             <if test="query.qcOperator != null and query.qcOperator != '' "> and h.qc_operator like '%${query.qcOperator}%'</if>
@@ -80,7 +83,7 @@
         poh.ship_via AS shipMethod,
         poh.supplier_no,
         ss.supplier_name,
-        poh.c_planner AS planner
+        ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner
         FROM PODetail pod
         INNER JOIN POHeader poh
         ON poh.order_no = pod.order_no
@@ -121,7 +124,10 @@
             AND ss.supplier_name like concat('%',#{query.supplierName},'%')
         </if>
         <if test="query.planner != null and query.planner != ''">
-            AND ISNULL(poh.c_planner, '') like concat('%',#{query.planner},'%')
+            AND (
+                ISNULL(poh.c_planner, '') like concat('%',#{query.planner},'%')
+                OR ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), '') like concat('%',#{query.planner},'%')
+            )
         </if>
         ORDER BY pod.id DESC
     </select>
@@ -150,7 +156,7 @@
         poh.ship_via AS shipMethod,
         poh.supplier_no AS supplierNo,
         ss.supplier_name AS supplierName,
-        poh.c_planner AS planner
+        ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner
         FROM PODetail pod
         INNER JOIN POHeader poh
         ON poh.order_no = pod.order_no
@@ -191,7 +197,10 @@
             AND ss.supplier_name like concat('%',#{query.supplierName},'%')
         </if>
         <if test="query.planner != null and query.planner != ''">
-            AND ISNULL(poh.c_planner, '') like concat('%',#{query.planner},'%')
+            AND (
+                ISNULL(poh.c_planner, '') like concat('%',#{query.planner},'%')
+                OR ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), '') like concat('%',#{query.planner},'%')
+            )
         </if>
         ORDER BY ISNULL(pod.c_crd,pod.want_receive_date) DESC, pod.id DESC
     </select>

src/main/resources/mapper/order/PODetailMapper.xml

@@ -163,7 +163,10 @@
             <if test="advancePayment != null and advancePayment != '' "> and c_advance_payment = #{advancePayment}</if>
             <if test="advancePaid != null and advancePaid != '' "> and c_advance_paid = #{advancePaid}</if>
             <if test="createTime != null and createTime != '' "> and create_time = #{createTime}</if>
-            <if test="planner != null and planner != '' "> and c_planner = #{planner}</if>
+            <if test="planner != null and planner != '' ">
+                and (c_planner = #{planner}
+                or ISNULL(dbo.plm_get_user_display(site, c_planner), '') = #{planner})
+            </if>
             <if test="edit != null and edit != '' "> and c_edit = #{edit}</if>
             <if test="endPlanner != null and endPlanner != '' "> and c_end_planner = #{endPlanner}</if>
             <if test="remarkDelay != null and remarkDelay != '' "> and c_remark_delay = #{remarkDelay}</if>
@@ -220,7 +223,7 @@
         ,pod.c_advance_payment as advancePayment
         ,pod.c_advance_paid as advancePaid
         ,pod.create_time as createTime
-        ,pod.c_planner as planner
+        ,ISNULL(suPlanner.user_display, poh.c_planner) as planner
         ,pod.c_edit as edit
         ,pod.c_end_planner as endPlanner
         ,pod.c_remark_delay as remarkDelay
@@ -262,6 +265,7 @@
         from PODetail pod
         left join POHeader poh on poh.order_no = pod.order_no
         left join srm_supplier ss on ss.supplier_no = poh.supplier_no and ss.site = pod.site
+        left join sys_user suPlanner on suPlanner.site = poh.site and suPlanner.username = poh.c_planner
         left join part p on p.part_no = pod.part_no and p.site = pod.site
         left join part_family pf1 on p.site = pf1.site and p.category = pf1.family_id
         where pod.site = '${query.site}'
@@ -328,7 +332,10 @@
         <if test="query.advancePayment != null and query.advancePayment != '' "> and pod.c_advance_payment like '%${query.advancePayment}%'</if>
         <if test="query.advancePaid != null and query.advancePaid != '' "> and pod.c_advance_paid like '%${query.advancePaid}%'</if>
         <if test="query.createTime != null and query.createTime != '' "> and pod.create_time like '%${query.createTime}%'</if>
-        <if test="query.planner != null and query.planner != '' "> and pod.c_planner like '%${query.planner}%'</if>
+        <if test="query.planner != null and query.planner != '' ">
+            and (poh.c_planner like '%${query.planner}%'
+            or ISNULL(suPlanner.user_display, '') like '%${query.planner}%')
+        </if>
         <if test="query.edit != null and query.edit != '' "> and pod.c_edit like '%${query.edit}%'</if>
         <if test="query.endPlanner != null and query.endPlanner != '' "> and pod.c_end_planner like '%${query.endPlanner}%'</if>
         <if test="query.remarkDelay != null and query.remarkDelay != '' "> and pod.c_remark_delay like '%${query.remarkDelay}%'</if>
@@ -388,7 +395,7 @@
         ,pod.c_advance_payment as advancePayment
         ,pod.c_advance_paid as advancePaid
         ,pod.create_time as createTime
-        ,pod.c_planner as planner
+        ,ISNULL(suPlanner.user_display, poh.c_planner) as planner
         ,pod.c_edit as edit
         ,pod.c_end_planner as endPlanner
         ,pod.c_remark_delay as remarkDelay
@@ -434,6 +441,7 @@
          and exv.order_no = pod.order_no
          and exv.item_no = pod.item_no
         left join srm_supplier ss on ss.supplier_no = poh.supplier_no and ss.site = pod.site
+        left join sys_user suPlanner on suPlanner.site = poh.site and suPlanner.username = poh.c_planner
         left join part p on p.part_no = pod.part_no and p.site = pod.site
         left join part_family pf1 on p.site = pf1.site and p.category = pf1.family_id
         where pod.site = #{query.site}

src/main/resources/mapper/order/POHeaderMapper.xml

@@ -55,7 +55,8 @@
 
 
     <select id="getListByModel" resultType="com.xujie.modules.order.entity.POHeader">
-        select <include refid="BaseColumnList" />
+        select <include refid="BaseColumnList" />,
+               ISNULL(dbo.plm_get_user_display(site, c_planner), c_planner) AS planner
         from POHeader
         where 1=1
             <if test="orderNo != null and orderNo != '' "> and order_no = #{orderNo}</if>
@@ -91,7 +92,9 @@
             <if test="destination != null and destination != '' "> and c_destination = #{destination}</if>
             <if test="enquiry != null and enquiry != '' "> and c_enquiry = #{enquiry}</if>
             <if test="confirmed != null and confirmed != '' "> and c_confirmed = #{confirmed}</if>
-            <if test="planner != null and planner != '' "> and c_planner = #{planner}</if>
+            <if test="planner != null and planner != '' ">
+                and (c_planner = #{planner} or ISNULL(dbo.plm_get_user_display(site, c_planner), '') = #{planner})
+            </if>
             <if test="confirmedBy != null and confirmedBy != '' "> and confirmed_by = #{confirmedBy}</if>
             <if test="confirmedRemark != null and confirmedRemark != '' "> and confirmed_remark = #{confirmedRemark}</if>
             <if test="id != null "> and id = #{id}</if>
@@ -105,7 +108,8 @@
 
     <select id="myPage" resultType="com.xujie.modules.order.entity.POHeader">
         select
-        <include refid="BaseColumnList"/>
+        <include refid="BaseColumnList"/>,
+        ISNULL(dbo.plm_get_user_display(site, c_planner), c_planner) AS planner
         from POHeader
         where 1=1
         <if test="query.orderNo != null and query.orderNo != '' "> and order_no like '%${query.orderNo}%'</if>
@@ -141,7 +145,10 @@
         <if test="query.cDestination != null and query.cDestination != '' "> and c_destination like '%${query.cDestination}%'</if>
         <if test="query.cEnquiry != null and query.cEnquiry != '' "> and c_enquiry like '%${query.cEnquiry}%'</if>
         <if test="query.cConfirmed != null and query.cConfirmed != '' "> and c_confirmed like '%${query.cConfirmed}%'</if>
-        <if test="query.planner != null and query.planner != '' "> and c_planner like '%${query.planner}%'</if>
+        <if test="query.planner != null and query.planner != '' ">
+            and (c_planner like '%${query.planner}%'
+            or ISNULL(dbo.plm_get_user_display(site, c_planner), '') like '%${query.planner}%')
+        </if>
         <if test="query.confirmedBy != null and query.confirmedBy != '' "> and confirmed_by like '%${query.confirmedBy}%'</if>
         <if test="query.confirmedRemark != null and query.confirmedRemark != '' "> and confirmed_remark like '%${query.confirmedRemark}%'</if>
         <if test="query.id != null "> and id = '${query.id}'</if>

src/main/resources/mapper/srm/SrmSupplierMapper.xml

@@ -117,7 +117,8 @@
         id,site,supplier_no,supplier_name,supplier_group,create_date,create_by,update_date,update_by,supplier_doc_type,
         TaxCode,tax,FaxNo,PhoneNo,PhoneNo2,PhoneNo3,Contact,Address,PaymentTerm,DeliveryTerm,Buyer,SourcingStaff,
         Currency,ABC,Active,BankName,BankAccount,TaxNo,Email,Email2,Other_contact1,Other_contact2,Other_contact3,Memo,
-        c_short_office,c_short_npc,planner
+        c_short_office,c_short_npc,
+        ISNULL(dbo.plm_get_user_display(site, planner), planner) AS planner
         FROM srm_supplier
         <where>