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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-api</artifactId>
-    <version>1.7</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -846,6 +846,12 @@ public class AMScontroller  extends BaseRESTfulController {
     }
 
     @ApiOperation("查询司磅地点")
-    @PostMapping("/getMaterialOperation")
-    RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map) {return amsFeign.getMaterialOperation(map);}
+    @PostMapping("/getSBDDList")
+    RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map) {return amsFeign.getSBDDList(map);}
+
+    @ApiOperation("获取提货单打印备注")
+    @PostMapping("/selectBalanceRemark")
+    RESTfulResult selectBalanceRemark(@RequestBody Map<String,Object> map) {
+        return amsFeign.selectBalanceRemark(map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -541,6 +541,14 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertPersonnel(map);
     }
 
+    @ApiOperation(value = "新增司机信息", notes = "根据rmsMaterial对象创建")
+    @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
+    @PostMapping(value = "/insertDriver")
+    @LogAround(foreignKeys = {"personnelId"}, foreignKeyTypes = {"人员"})
+    public Map<String, Object> insertDriver(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertDriver(map);
+    }
+
     @ApiOperation(value = "删除", notes = "根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/deletePersonnel")

src/main/java/com/steerinfo/dil/controller/ReportController.java

@@ -94,4 +94,14 @@ public class ReportController {
     Map<String, Object> getSaleFourLicenceReport(@RequestBody(required=false) HashMap<String,Object> mapValue){
         return reportFeign.getSaleFourLicenceReport(mapValue);
     }
+
+
+    @ApiOperation(value="承运商报表")
+    @PostMapping(value = "/getTransReportCarrier")
+    Map<String, Object> getTransReportCarrier(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+        return reportFeign.getTransReportCarrier(mapValue,apiId,pageNum,pageSize);
+    }
 }

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -332,4 +332,11 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult getDriverInfo(@RequestBody Map<String,Object> map) {
         return success(universalMapper.getDriverInfo(map));
     }
+
+    @ApiOperation("需求边输边查")
+    @PostMapping("/getRequireByLike")
+    public RESTfulResult getRequireByLike(@RequestBody Map<String,Object> map) {
+        return success(universalMapper.getRequireByLike(map));
+    }
+
 }

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -312,6 +312,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amsscheduledispatchs/noPage")
     Map<String, Object> amsScheduleDispatchNoPage(@RequestBody Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/ams/amstransrequirements/getMaterialOperation")
-    RESTfulResult getMaterialOperation(@RequestBody Map<String,Object> map);
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getSBDDList")
+    RESTfulResult getSBDDList(@RequestBody Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectBalanceRemark")
+    RESTfulResult selectBalanceRemark(@RequestBody Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/feign/ReportFeign.java

@@ -42,4 +42,10 @@ public interface ReportFeign {
 
     @PostMapping(value = "api/v1/report/saleReports/getSaleFourLicenceReport")
     Map<String, Object> getSaleFourLicenceReport(@RequestBody(required = false) HashMap<String, Object> map);
+
+    @PostMapping(value = "api/v1/report/saleReports/getTransReportCarrier")
+    Map<String, Object> getTransReportCarrier(@RequestBody(required = false) HashMap<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam  Integer pageNum,
+                                              @RequestParam  Integer pageSize);
 }

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -244,6 +244,9 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmspersonnel/insertPersonnel")
     Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/rms/rmspersonnel/insertDriver")
+    Map<String, Object> insertDriver(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel")
     Map<String, Object> deletePersonnel(@RequestBody(required = false) Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -104,4 +104,6 @@ public interface UniversalMapper {
     Map<String,Object> getCapacityInfo(Map<String, Object> map);
 
     Map<String,Object> getDriverInfo(Map<String, Object> map);
+
+    List<Map<String, Object>> getRequireByLike(Map<String, Object> map);
 }

src/main/resources/application-prod.yml

@@ -30,7 +30,7 @@ openfeign:
 #    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${RMSFEIGN_URL:localhost:8086}
+#    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:
@@ -44,7 +44,7 @@ openfeign:
     url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
   REPORTFeign:
     url: ${REPORTFEIGN_URL:172.16.90.202:8000}
-#    url: ${RMSFEIGN_URL:localhost:8055}
+#    url: ${REPORTFEIGN_URL:localhost:8055}
 
 
 #远程调用

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

@@ -31,6 +31,7 @@
                      LEFT JOIN RMS_PERSONNEL_COMPANY RPC ON RP.PERSONNEL_ID = RPC.PERSONNEL_ID
             WHERE RPC.DELETED = 0
               AND RP.PERSONNEL_JOB_NUMBER = #{userName}
+              AND nvl(RP.PERSONNEL_POST,'无') != '司机'
         )
         CONNECT BY PRIOR RC.COMPANY_ID = rc.PARENT_COMPANY_ID
         )

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

@@ -101,6 +101,7 @@
             RC.COMPANY_NAME "label",
             RC.COMPANY_NAME "text",
             RC.COMPANY_NAME "companyName",
+            RC.CREDENTIAL_DESC  "seqNo",
             T2 ."rootCompanyId",
             T2 ."rootCompanyName",
             'label' "prop"
@@ -167,6 +168,7 @@
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
             </if>
             </where>
+            ORDER BY to_number("seqNo")
             FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -186,6 +188,7 @@
             RC.COMPANY_NAME "label",
             RC.COMPANY_NAME "text",
             RC.COMPANY_NAME "companyName",
+            RC.CREDENTIAL_DESC  "seqNo",
             T2 ."rootCompanyId",
             T2 ."rootCompanyName",
             'label' "prop"
@@ -219,7 +222,7 @@
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
-            order by LENGTH(company_name))
+            order by to_number(RC.CREDENTIAL_DESC),LENGTH(company_name))
         </if>
     </select>
     <select id="getMaterialTypeByLike" resultType="java.util.Map">
@@ -459,6 +462,8 @@
         RCA. CAPACITY_AXIS_NUMBER "capacityAxisNumber",
         RCA.CAPACITY_WEIGHT_MAIN "capacityWeightMain",
         RCA.CAPACITY_WEIGHT_TRAILER "capacityWeightTrailer",
+        RCA.CAPACITY_TYPE_ID "capacityTypeId",
+        RCA.EMISSION_STANDARD_ID "emissionStandardId",
         RCA.CAPACITY_NUMBER "label",
         RCA.CAPACITY_NUMBER "text",
         RCA.REMARK1 "remark1",
@@ -533,6 +538,8 @@
             RCA. CAPACITY_AXIS_NUMBER "capacityAxisNumber",
             RCA.CAPACITY_WEIGHT_MAIN "capacityWeightMain",
             RCA.CAPACITY_WEIGHT_TRAILER "capacityWeightTrailer",
+            RCA.CAPACITY_TYPE_ID "capacityTypeId",
+            RCA.EMISSION_STANDARD_ID "emissionStandardId",
             RCA.CAPACITY_NUMBER "label",
             RCA.CAPACITY_NUMBER "text",
             RCA.REMARK1 "remark1",
@@ -1718,4 +1725,51 @@
         SELECT * FROM RMS_PERSONNEL
         WHERE PERSONNEL_JOB_NUMBER = #{jobNumber}
     </select>
+    <select id="getRequireByLike" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT DISTINCT
+        ATR .SERIAL_NUMBER "supplementary",
+        ATR .TRANS_REQUIREMENT_ID "id",
+        ATR .TRANS_REQUIREMENT_ID "value",
+        ATR .SERIAL_NUMBER "label",
+        ATR .SERIAL_NUMBER "text"
+        FROM
+        AMS_TRANS_REQUIREMENT ATR
+        LEFT JOIN AMS_REQUIREMENT_CHILD ARC
+        ON ARC.TRANS_REQUIREMENT_ID = ATR.TRANS_REQUIREMENT_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ARC.MATERIAL_ID
+        <where>
+            ATR.DELETED NOT IN (2,5,6)
+            <if test="index != null and index != ''">
+                AND REGEXP_LIKE(ATR.SERIAL_NUMBER, #{index})
+            </if>
+            <if test="materialCode != null and materialCode!=''">
+                AND REGEXP_LIKE(RM.MATERIAL_CODE, #{materialCode})
+            </if>
+            <if test="receivingCompanyId != null and receivingCompanyId != ''">
+                AND REGEXP_LIKE(ATR.RECEIVING_COMPANY_ID , #{receivingCompanyId})
+            </if>
+            <if test="materialId !=null and materialId != ''">
+                AND REGEXP_LIKE(ARC.MATERIAL_ID, #{materialId})
+            </if>
+        </where>
+        FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+            UNION
+            SELECT DISTINCT
+            ATR .SERIAL_NUMBER "supplementary",
+            ATR .TRANS_REQUIREMENT_ID "id",
+            ATR .TRANS_REQUIREMENT_ID "value",
+            ATR .SERIAL_NUMBER "label",
+            ATR .SERIAL_NUMBER "text"
+            FROM
+            AMS_TRANS_REQUIREMENT ATR
+            WHERE ATR .TRANS_REQUIREMENT_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,stdout, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -37,6 +37,8 @@ log4j.appender.errorfile.Threshold = ERROR
 log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
 #log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
 log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+log4j.appender.errorfile.MaxFileSize=100MB
+log4j.appender.errorfile.MaxBackupIndex=3
 
 ### 运行日志 ###
 log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
@@ -46,6 +48,8 @@ log4j.appender.RUNNING.Threshold = INFO
 log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+log4j.appender.RUNNING.MaxFileSize=100MB
+log4j.appender.RUNNING.MaxBackupIndex=3
 
 ### 指定类###
 log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB