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

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

@@ -1670,6 +1670,13 @@ public class AMScontroller{
         return amsFeign.insertNotice(map);
     }
 
+    @ApiOperation(value="发布公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/releaseNotice")
+    public Map<String, Object> releaseNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.releaseNotice(map);
+    }
+
     @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
     @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
@@ -1677,6 +1684,12 @@ public class AMScontroller{
         return amsFeign.updateNotice(map);
     }
 
+
+    @PostMapping(value = "/updateNoticeStatus", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.updateNoticeStatus(map);
+    }
+
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
@@ -1684,7 +1697,12 @@ public class AMScontroller{
         return amsFeign.deleteNotice(id);
     }
 
-
+    @ApiOperation(value="获取名字", notes="根据url的id来获取对象名字")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    @PostMapping(value = "/queryName/{userId}")//BigDecimal
+    public Map<String, Object> queryName(@PathVariable("userId") String userId) {
+        return amsFeign.queryName(userId);
+    }
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")

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

@@ -78,4 +78,24 @@ public class BackgroundProcessingController extends BaseRESTfulController {
         int i = backgroundProcessingService.bindCidCapacityNo(cid,capacityNo);
         return success(i);
     }
+
+    @ApiOperation(value = "更新运输订单canwork状态")
+    @PostMapping("updateOrderCanWork")
+    public RESTfulResult updateOrderCanWork(String orderNumber){
+        if(orderNumber != null){
+            int i = backgroundProcessingMapper.updateOrderCanWork(orderNumber);
+            return success(i);
+        }
+        return success(0);
+    }
+
+    @ApiOperation(value = "更新运输订单状态接口")
+    @PostMapping("updateOrderStatus")
+    public RESTfulResult updateOrderStatus(@RequestBody(required = false) Map<String,Object> map){
+        if(map.get("orderNumber") != null){
+            int i = backgroundProcessingMapper.updateOrderStatus(map);
+            return success(i);
+        }
+        return failed(0);
+    }
 }

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

@@ -2580,11 +2580,12 @@ public class TMSController extends BaseRESTfulController {
                                                  String capacityNo,
                                                  String carrierName,
                                                  String consigneeName,
-                                                 String saler){
+                                                 String saler,
+                                                 String easPrimaryId){
         if(map==null){
             map=new HashMap<>();
         }
-        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
+        return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
     }
 
 

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

@@ -1469,14 +1469,27 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/dilnotices/insertNotice")
     Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
 
+    //发布公告
+    @PostMapping(value = "api/v1/ams/dilnotices/releaseNotice")
+    Map<String,Object> releaseNotice(@RequestBody(required = false) Map<String,Object> map);
+
     //删除公告
     @PostMapping(value = "api/v1/ams/dilnotices/deleteNotice/{id}")
     Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
 
+
+    //获取公告名字
+    @PostMapping(value = "api/v1/ams/dilnotices/queryName/{userId}")
+    Map<String, Object> queryName(@PathVariable("userId") String userId);
+
     //更新公告
     @PostMapping(value = "api/v1/ams/dilnotices/updateNotice")
     Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
 
+    //根据用户ID更新状态
+    @PostMapping(value = "api/v1/ams/dilnotices/updateNoticeStatus")
+    Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map);
+
     //根据id获取公告
     @PostMapping(value = "api/v1/ams/dilnotices/getNoticeById/{id}")
     Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);

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

@@ -732,7 +732,8 @@ public interface TmsTruckFeign {
                                            @RequestParam("capacityNo") String capacityNo,
                                            @RequestParam("carrierName") String carrierName,
                                            @RequestParam("consigneeName") String consigneeName,
-                                           @RequestParam("saler") String saler
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
                                            );
 
     @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")

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

@@ -55,4 +55,8 @@ public interface BackgroundProcessingMapper {
 
     int allowEnfactory(String orderNumber);
 
+    int updateOrderCanWork(String orderNumber);
+
+    int updateOrderStatus(Map<String, Object> map);
+
 }

src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:

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

@@ -201,4 +201,15 @@
             ${id}
         </foreach>
     </delete>
+
+    <update id="updateOrderCanWork" parameterType="string">
+        update OMSTRUCK_ORDER OO
+        set oo.CAN_WORK = 2
+        where oo.ORDER_NUMBER = #{orderNumber}
+    </update>
+    <update id="updateOrderStatus" parameterType="java.util.Map">
+        update OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = #{orderStatus}
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </update>
 </mapper>

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

@@ -1353,7 +1353,7 @@
 
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO
-        SET OO.CAN_WORK = 1
+        SET OO.ORDER_STATUS = 7
         WHERE OO.ORDER_ID IN
         (SELECT OO.ORDER_ID
         FROM OMSTRUCK_ORDER OO