Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

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

@@ -2160,7 +2160,13 @@ public class AMScontroller{
 
     @ApiOperation("钢坯需求计划派单")
     @PostMapping("/addBilletRequirement")
-    public RESTfulResult addBilletRequirement(@RequestBody Map<String,Object> map) {
+    public Map<String,Object> addBilletRequirement(@RequestBody Map<String,Object> map) {
         return amsFeign.addBilletRequirement(map);
     }
+
+    @ApiOperation("钢坯炉号抽取")
+    @PostMapping("/checkBillet")
+    public Map<String,Object> checkBillet(@RequestBody Map<String,Object> map) {
+        return amsFeign.checkBillet(map);
+    }
 }

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

@@ -2607,7 +2607,26 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
     }
 
-
+    @ApiOperation(value = "销售钢材未装统计报表")
+    @PostMapping("/loadingSaleSteelReport")
+    public Map<String,Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler,
+                                                 String easPrimaryId){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.loadingSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
+    }
 
 
     @ApiOperation(value = "销售钢材统计报表")
@@ -2728,4 +2747,5 @@ public class TMSController extends BaseRESTfulController {
 
 
 
+
 }

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

@@ -1818,7 +1818,7 @@ public interface AmsFeign {
     Map<String, Object> closeDueDate(@RequestParam BigDecimal requirementId);
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/addBilletRequirement")
-    RESTfulResult addBilletRequirement(@RequestBody Map<String, Object> map);
+    Map<String,Object> addBilletRequirement(@RequestBody Map<String, Object> map);
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getBilletRequirementList")
     Map<String, Object> getBilletRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -1829,4 +1829,7 @@ public interface AmsFeign {
                                                  @RequestParam String index,
                                                  @RequestParam String startTime,
                                                  @RequestParam String endTime);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/checkBillet")
+    Map<String, Object> checkBillet(@RequestBody Map<String, Object> map);
 }

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

@@ -736,6 +736,22 @@ public interface TmsTruckFeign {
                                            @RequestParam("easPrimaryId") String easPrimaryId
                                            );
 
+    @PostMapping("/api/v1/truckTms/statisticalReport/loadingSaleSteelReport")
+    Map<String, Object> loadingSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
+    );
+
     @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")
     Map<String, Object> getInwardSaleSteelReport(@RequestBody(required = false) Map<String, Object> map,
                                                  @RequestParam("startTime") String startTime,

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

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