Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1419,7 +1419,7 @@ public class AMScontroller{
     }
 
     @PostMapping("getSaleOrderInfoes")
-    @ApiOperation(value = "查询汽运单价信息")
+    @ApiOperation(value = "查询销售订单未上报信息")
     public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
@@ -1427,11 +1427,12 @@ public class AMScontroller{
                                                   String consigneeSsoId,
                                                   @RequestParam(required = false) String con,
                                                   String startTime,
-                                                  String endTime) {
+                                                  String endTime,
+                                                  String saler) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime,saler);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1443,11 +1444,12 @@ public class AMScontroller{
                                                @RequestParam(required = false) String consigneeSsoId,
                                                @RequestParam(required = false) String con,
                                                String startTime,
-                                               String endTime){
+                                               String endTime,
+                                               String saler){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime,saler);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")
@@ -1466,9 +1468,10 @@ public class AMScontroller{
                                                               Integer saleType,
                                                               String consigneeSsoId,
                                                               String startTime,
-                                                              String endTime
+                                                              String endTime,
+                                                              String saler
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime,saler);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1822,11 +1825,13 @@ public class AMScontroller{
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
-                                             @RequestParam(required = false) String con) {
+                                             @RequestParam(required = false) String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false) String endTime  ) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getHaveCarTruckNoList(mapValue, apiId, pageNum, pageSize, con);
+        return amsFeign.getHaveCarTruckNoList(mapValue, apiId, pageNum, pageSize, con,startTime,endTime);
     }
 
     @ApiOperation(value="获取零星订单的物资详情")
@@ -1939,9 +1944,9 @@ public class AMScontroller{
                                                   String con,
                                                         String consigneeSsoId,
                                                         String startTime,
-                                                        String endTime
+                                                        String endTime,String saler
     ) {
-        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime);
+        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime,saler);
     }
 
     @ApiOperation(value = "修改厂内未装货车辆的运单车牌号")

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

@@ -1939,8 +1939,8 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
-    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list) {
-        return tmsTrainFeign.addDomesticLoadResult(list);
+    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.addDomesticLoadResult(mapValue);
     }
 
     @ApiOperation(value = "国产矿物流补录装车信息")

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

@@ -697,10 +697,10 @@ public class UniversalController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null")) {
+        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null") && materialNameText != "" && !"".equals(materialNameText)) {
             mapValue.put("materialNameText", materialNameText);
         }
-        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null")) {
+        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null") && materialSpecificationText != "" && !"".equals(materialSpecificationText)) {
             mapValue.put("materialSpecificationText", materialSpecificationText);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -775,7 +775,6 @@ public class UniversalController extends BaseRESTfulController {
     @GetMapping("/getTransRange")
     public RESTfulResult getTransRange(){
         return success(universalMapper.getTransRange());
-
     }
 
 //    //测试质保书回显
@@ -856,4 +855,18 @@ public class UniversalController extends BaseRESTfulController {
     public Map<String,Object>getConsigneeByuserid(String userId){
         return universalMapper.getConsigneeByuserid(userId);
     }
+
+    //根据销售订单ID修改销售订单状态为上报
+    @PostMapping("/updateSaleOrderStatusById")
+    @ApiOperation(value = "根据销售订单id修改状态为未上报")
+    public RESTfulResult updateSaleOrderStatusById(BigDecimal saleOrderId){
+        return success(universalMapper.updateSaleOrderStatusById(saleOrderId));
+    }
+
+    //根据销售订单ID修改销售订单状态为上报
+    @PostMapping("/updateDriverTel")
+    @ApiOperation(value = "修改司机电话号码")
+    public RESTfulResult updateDriverTel(@RequestBody Map<String,Object> map){
+        return success(universalMapper.updateDriverTel(map));
+    }
 }

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

@@ -1357,7 +1357,8 @@ public interface AmsFeign {
                                            @RequestParam(required = false) String consigneeSsoId,
                                            @RequestParam(required = false) String con,
                                            @RequestParam String startTime,
-                                           @RequestParam String endTime);
+                                           @RequestParam String endTime,
+                                           @RequestParam String saler);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1371,7 +1372,8 @@ public interface AmsFeign {
                                                @RequestParam(required = false) String consigneeSsoId,
                                                @RequestParam(required = false) String con,
                                                @RequestParam String startTime,
-                                               @RequestParam String endTime);
+                                               @RequestParam String endTime,
+                                               @RequestParam String saler);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1383,7 +1385,8 @@ public interface AmsFeign {
                                                        @RequestParam(required = false) Integer saleType,
                                                        @RequestParam(required = false) String consigneeSsoId,
                                                        @RequestParam(required = false) String startTime,
-                                                       @RequestParam(required = false) String endTime
+                                                       @RequestParam(required = false) String endTime,
+                                                       @RequestParam(required = false) String saler
     );
 
     @ApiOperation(value="查询财务已审批销售订单信息")
@@ -1608,7 +1611,9 @@ public interface AmsFeign {
                                         @RequestParam Integer apiId,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam String con);
+                                        @RequestParam String con,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
     @PostMapping(value = "/api/v1/ams/amstrucksporadicorders/getSporadic")
     Map<String, Object> getSporadic(@RequestParam Integer sporadicId);
 
@@ -1698,7 +1703,8 @@ public interface AmsFeign {
                                                  @RequestParam String con,
                                                  @RequestParam String consigneeSsoId,
                                                  @RequestParam(required = false) String startTime,
-                                                 @RequestParam(required = false) String endTime);
+                                                 @RequestParam(required = false) String endTime,
+                                                 @RequestParam(required = false) String saler);
 
     // 修改厂内未装货车辆的运单车牌号
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")

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

@@ -237,7 +237,7 @@ public interface TmsTrainFeign {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
-    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list);
+    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
 
     @ApiOperation(value = "国产矿物流补录装车信息")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/updateDomesticLoadResult")

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

@@ -200,4 +200,7 @@ public interface UniversalMapper {
 
     Map<String, Object> getConsigneeByuserid(String userId);
 
+    int updateSaleOrderStatusById(BigDecimal saleOrderId);
+    // 修改司机电话
+    int updateDriverTel(Map<String, Object> map);
 }

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

@@ -6,6 +6,11 @@
         set oo.order_line_sequence = #{orderLineSqe}
         where oo.order_id = #{orderId}
     </update>
+    <update id="updateSaleOrderStatusById">
+        update AMS_SALE_ORDER ASO
+        SET ASO.SALE_ORDER_STATUS = 0
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+    </update>
     <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_NUMBER             "orderNumber",
                RC.CAPACITY_NUMBER          "capacityNumber",
@@ -839,10 +844,12 @@
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel",
-        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel"
+        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel",
+        RM.MATERIAL_COUNT "materialCount"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
         AND RM.MATERIAL_ID != 2533
+        AND RM.MATERIAL_ID != 3465
         <if test="materialNameText != null">
             AND (instr(RM.MATERIAL_NAME || RM.MATERIAL_MODEL, #{materialNameText}) > 0)
         </if>
@@ -877,7 +884,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialCode" ASC
+            order by "materialCount" DESC
         </if>
     </select>
 
@@ -1011,4 +1018,10 @@
         from RMS_CONSIGNEE RC
         WHERE RC.CONSIGNEE_SSO_ID = #{userId}
     </select>
+
+    <update id="updateDriverTel" parameterType="java.util.Map">
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.DRIVER_TEL = #{driverTel}
+        WHERE OO.ORDER_ID = #{orderId}
+    </update>
 </mapper>