Redeem hai 1 ano
pai
achega
883dc92cdf

+ 8 - 0
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -454,4 +454,12 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+
+    @ApiModelProperty(value = "根据运单号查询运单信息")
+    @PostMapping("/getTransOrderInFoByNo")
+    public RESTfulResult getTransOrderInFoByNo(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getTransOrderInFoByNo(map);
+        return success(list);
+    }
+
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -128,4 +128,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getInventoryByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getTransOrderInFoByNo(Map<String, Object> map);
+
 }

+ 2 - 2
src/main/resources/application-prod.yml

@@ -34,8 +34,8 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8093}
   RmsFeign:
-#    url: ${RMSFEIGN_URL:172.16.90.202:8060}
-      url: ${RMSFEIGN_URL:172.16.90.202:8060}
+    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+#      url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
     url: ${EMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:

+ 11 - 2
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -468,7 +468,7 @@
             AND SOURCE_ID IS NOT NULL
         </if>
         <if test="DiaoCar!=null">
-            AND RP.PERSONNEL_POST in ('摆放','指挥工')
+            AND RP.PERSONNEL_POST in ('业务处人工队')
         </if>
         )
         <where>
@@ -498,7 +498,7 @@
             ORDER BY "countNumber" DESC
         </if>
         <if test="!(capacityId!=null and capacityId!='')">
-            order by "personnelId" desc
+            order by LENGTH("label") ASC,"personnelId" desc
         </if>
         FETCH NEXT 10 ROWS ONLY
         )
@@ -1465,6 +1465,7 @@
     <select id="getIdCardCode" resultType="java.lang.String">
         SELECT RC.INNNER_CODE FROM RMS_PERSONNEL RC
         WHERE RC.PERSONNEL_JOB_NUMBER = #{jobNumber}
+        AND RC.PERSONNEL_POST = '司机'
         FETCH NEXT 1 ROWS ONLY
     </select>
 
@@ -2291,5 +2292,13 @@
         </if>
     </where>
     </select>
+    <select id="getTransOrderInFoByNo" resultType="java.util.Map">
+        SELECT OTO.CAPACITY_NUMBER "capacityNumber",
+               OTO.DRIVER_NAME "driverName",
+               OTO.CAPACITY_ID "capacityId",
+               OTO.DRIVER_ID "driverId"
+               FROM OMS_TRANS_ORDER OTO
+        WHERE OTO.SERIAL_NUMBER = #{transOrderNumber}
+    </select>
 
 </mapper>