Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/resources/application-prod.yml

@@ -26,11 +26,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${AMSFEIGN_URL:localhost:8079}
+#    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${TMSFEIGN_URL:localhost:8086}
+#    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:

src/main/resources/com/steerinfo/dil/mapper/BackgroundProcessingMapper.xml

@@ -90,7 +90,8 @@
         SELECT DISTINCT
             RP.PERSONNEL_ID "personnelId",
             RP.PERSONNEL_NAME "personnelName",
-            RP.PERSONNEL_POST "personnelPost"
+            RP.PERSONNEL_POST "personnelPost",
+            RP.PERSONNEL_TEAM "personnelTeam"
         FROM RMS_PERSONNEL  RP
         WHERE RP.DELETED = 0
           AND RP.PERSONNEL_JOB_NUMBER = #{loginName}

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1065,6 +1065,8 @@
         RC.MATERIAL_NAME "text",
         'materialName' "prop"
         from RMS_MATERIAL RC
+        left join rms_material_map t
+        on t.prod_code_l = RC.MATERIAL_CODE
         <where>
             DELETED = 0
             <if test="index!=null and index!=''">
@@ -1080,6 +1082,10 @@
             <if test="materialId!=null and materialId!=''">
                 AND RC.MATERIAL_ID = #{materialId}
             </if>
+            <if test="prodCode!=null and prodCode!=''">
+                AND ( REGEXP_LIKE(t.prod_code, #{prodCode})
+                OR REGEXP_LIKE(RC.MATERIAL_CODE, #{prodCode}) )
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
         )
@@ -1345,6 +1351,9 @@
             <if test="prodCode != null and prodCode != ''">
                 and REGEXP_LIKE(t.prod_code, #{prodCode})
             </if>
+            <if test="prodName != null and prodName != ''">
+                and REGEXP_LIKE(b.material_name, #{prodName})
+            </if>
         </where>
         union all
         select '' as "prodCodePk",
@@ -1376,6 +1385,9 @@
             <if test="prodCode != null and prodCode != ''">
                 and REGEXP_LIKE(b.material_code, #{prodCode})
             </if>
+            <if test="prodName != null and prodName != ''">
+                and REGEXP_LIKE(b.material_name, #{prodName})
+            </if>
             <if test="materialId != null and materialId != ''">
                 and REGEXP_LIKE(b.material_id, #{materialId})
             </if>
@@ -1749,6 +1761,8 @@
         ON ARC.TRANS_REQUIREMENT_ID = ATR.TRANS_REQUIREMENT_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = ARC.MATERIAL_ID
+        LEFT JOIN RMS_COMPANY RC
+        ON RC.COMPANY_ID = ATR.RECEIVING_COMPANY_ID
         <where>
             ATR.DELETED NOT IN (2,5,6)
             <if test="index != null and index != ''">
@@ -1763,6 +1777,9 @@
             <if test="materialId !=null and materialId != ''">
                 AND REGEXP_LIKE(ARC.MATERIAL_ID, #{materialId})
             </if>
+            <if test="receiveCompanyName !=null and receiveCompanyName != ''">
+                AND REGEXP_LIKE(RC.COMPANY_NAME, #{receiveCompanyName})
+            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
         )

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,stdout, RUNNING,errorfile
+log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout