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.2</version>
+    <version>1.7</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -98,7 +98,6 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "批量派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/batchDispatch")
-    @RequestLimit(seconds = 100)
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
     public Map<String, Object> batchDispatch(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.batchDispatch(map);
@@ -107,7 +106,6 @@ public class TMSController extends BaseRESTfulController {
     @ApiOperation(value = "批量派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/batchDispatchSc")
-    @RequestLimit(seconds = 100)
     @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
     public Map<String, Object> batchDispatchSc(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.batchDispatchSc(map);

src/main/resources/application-prod.yml

@@ -29,8 +29,8 @@ openfeign:
     url: ${AMSFEIGN_URL:172.16.90.202:8000}
 #    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-#    url: ${TMSFEIGN_URL:172.16.90.202:8000}
-    url: ${RMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+#    url: ${RMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:

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

@@ -459,22 +459,6 @@
         RCA. CAPACITY_AXIS_NUMBER "capacityAxisNumber",
         RCA.CAPACITY_WEIGHT_MAIN "capacityWeightMain",
         RCA.CAPACITY_WEIGHT_TRAILER "capacityWeightTrailer",
-        CASE WHEN RC.COMPANY_TYPE = '业务单位'
-        THEN RC.COMPANY_ID
-        else -1
-        END "businessCompanyId",
-        CASE WHEN RC.COMPANY_TYPE = '承运商'
-        THEN RC.COMPANY_ID
-        else -1
-        END "carrierId",
-        CASE WHEN RC.COMPANY_TYPE = '发货单位'
-        THEN RC.COMPANY_ID
-        else -1
-        END "shippingCompanyId",
-        CASE WHEN RC.COMPANY_TYPE = '收货客户'
-        THEN RC.COMPANY_ID
-        else -1
-        END "receivingCompanyId",
         RCA.CAPACITY_NUMBER "label",
         RCA.CAPACITY_NUMBER "text",
         RCA.REMARK1 "remark1",
@@ -490,8 +474,6 @@
         </if>
         FROM
         RMS_CAPACITY RCA
-        LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
-        LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
         LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
         left join oms_trans_order oto
         on RCA.capacity_id = oto.capacity_id
@@ -551,22 +533,6 @@
             RCA. CAPACITY_AXIS_NUMBER "capacityAxisNumber",
             RCA.CAPACITY_WEIGHT_MAIN "capacityWeightMain",
             RCA.CAPACITY_WEIGHT_TRAILER "capacityWeightTrailer",
-            CASE WHEN RC.COMPANY_TYPE = '业务单位'
-            THEN RC.COMPANY_ID
-            else -1
-            END "businessCompanyId",
-            CASE WHEN RC.COMPANY_TYPE = '承运商'
-            THEN RC.COMPANY_ID
-            else -1
-            END "carrierId",
-            CASE WHEN RC.COMPANY_TYPE = '发货单位'
-            THEN RC.COMPANY_ID
-            else -1
-            END "shippingCompanyId",
-            CASE WHEN RC.COMPANY_TYPE = '收货客户'
-            THEN RC.COMPANY_ID
-            else -1
-            END "receivingCompanyId",
             RCA.CAPACITY_NUMBER "label",
             RCA.CAPACITY_NUMBER "text",
             RCA.REMARK1 "remark1",
@@ -581,8 +547,6 @@
                 ,NVL(T ."countNumber",0) "countNumber"
             </if>
             FROM RMS_CAPACITY RCA
-            LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
-            LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
             LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
             left join oms_trans_order oto
             on RCA.capacity_id = oto.capacity_id
@@ -931,6 +895,9 @@
             <if test="capacityTypeId!=null and capacityTypeId!=''">
                 AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
             </if>
+            <if test="insertUserName != null and insertUserName !='' ">
+                AND RCT.INSERT_USERNAME = #{insertUserName}
+            </if>
             <if test="isPCapacityTypeId!=null and isPCapacityTypeId!=''">
                 AND RCT.P_CAPACITY_TYPE_ID is null
             </if>
@@ -1058,7 +1025,16 @@
         select * from(
         select
         RC.MATERIAL_ID "materialId",
-        RC.MATERIAL_NAME "label",
+        RC.MATERIAL_NAME ||
+        (CASE
+        WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL AND RC.MATERIAL_MODEL IS NOT NULL
+        THEN ' ' || RC.MATERIAL_SPECIFICATION || ' ' || RC.MATERIAL_MODEL
+        WHEN RC.MATERIAL_SPECIFICATION IS NOT NULL
+        THEN ' ' || RC.MATERIAL_SPECIFICATION
+        WHEN RC.MATERIAL_MODEL IS NOT NULL
+        THEN ' ' || RC.MATERIAL_MODEL
+        ELSE ''
+        END)    "label",
         RC.MATERIAL_ID "id",
         RC.MATERIAL_ID "value",
         RC.MATERIAL_CODE ||
@@ -1588,22 +1564,6 @@
         select count(*) from oms_trans_order oto where oto.driver_id = rp.personnel_id or oto.driver_id2 = rp.personnel_id
         ) "orders",
         to_char(RP.SSO_ID) "ssoId",
-        CASE WHEN RC.COMPANY_TYPE = '业务单位'
-        THEN RC.COMPANY_ID
-        else -1
-        END "businessCompanyId",
-        CASE WHEN RC.COMPANY_TYPE = '承运商'
-        THEN RC.COMPANY_ID
-        else -1
-        END "carrierId",
-        CASE WHEN RC.COMPANY_TYPE = '发货单位'
-        THEN RC.COMPANY_ID
-        else -1
-        END "shippingCompanyId",
-        CASE WHEN RC.COMPANY_TYPE = '收货客户'
-        THEN RC.COMPANY_ID
-        else -1
-        END "receivingCompanyId",
         RP.PERSONNEL_ID "id",
         RP.PERSONNEL_ID "value",
         RP.PERSONNEL_NAME "label",
@@ -1614,10 +1574,6 @@
         </if>
         FROM
         RMS_PERSONNEL RP
-        LEFT JOIN RMS_PERSONNEL_COMPANY RPC
-        ON RPC.PERSONNEL_ID = RP.PERSONNEL_ID
-        LEFT JOIN RMS_COMPANY RC
-        ON RC.COMPANY_ID = RPC.COMPANY_ID
         <if test="capacityId!=null and capacityId!=''">
             LEFT JOIN (
             SELECT DRIVER_ID "driverId",
@@ -1673,22 +1629,6 @@
             select count(*) from oms_trans_order oto where oto.driver_id = rp.personnel_id or oto.driver_id2 = rp.personnel_id
             ) "orders",
             to_char(RP.SSO_ID) "ssoId",
-            CASE WHEN RC.COMPANY_TYPE = '业务单位'
-            THEN RC.COMPANY_ID
-            else -1
-            END "businessCompanyId",
-            CASE WHEN RC.COMPANY_TYPE = '承运商'
-            THEN RC.COMPANY_ID
-            else -1
-            END "carrierId",
-            CASE WHEN RC.COMPANY_TYPE = '发货单位'
-            THEN RC.COMPANY_ID
-            else -1
-            END "shippingCompanyId",
-            CASE WHEN RC.COMPANY_TYPE = '收货客户'
-            THEN RC.COMPANY_ID
-            else -1
-            END "receivingCompanyId",
             RP.PERSONNEL_ID "id",
             RP.PERSONNEL_ID "value",
             RP.PERSONNEL_NAME "label",
@@ -1698,10 +1638,6 @@
                 ,NVL(T ."countNumber",0) "countNumber"
             </if>
             from RMS_PERSONNEL RP
-            LEFT JOIN RMS_PERSONNEL_COMPANY RPC
-            ON RPC.PERSONNEL_ID = RP.PERSONNEL_ID
-            LEFT JOIN RMS_COMPANY RC
-            ON RC.COMPANY_ID = RPC.COMPANY_ID
             <if test="capacityId!=null and capacityId!=''">
                 LEFT JOIN (
                 SELECT DRIVER_ID "driverId",