合并

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

@@ -1697,4 +1697,21 @@ public class AMScontroller{
     public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
         return amsFeign.refuseDispatchSaleOrderList(mapList);
     }
+
+    @ApiOperation(value="获取零星订单的物资详情")
+    @PostMapping(value = "/getSporadic")
+    public Map<String, Object> getSporadic(Integer sporadicId) {
+        return amsFeign.getSporadic(sporadicId);
+    }
+
+    @ApiOperation(value = "查零星订单物资详情")
+    @PostMapping("/getSporadicOfOrder")
+    public Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer sporadicId
+    ) {
+        return amsFeign.getSporadicOfOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,sporadicId);
+    }
 }

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

@@ -621,7 +621,11 @@ public class OMSController {
     public Map<String,Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String,Object>map){
         return omsFeign.getUnloadOrderMaterial(map);
     }
-
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("/getUnloadOrderWarehouseName")
+    public Map<String,Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String,Object>map){
+        return omsFeign.getUnloadOrderWarehouseName(map);
+    }
 
     @ApiOperation(value = "分解异地库计划")
     @PostMapping("/apportionInwardOffsetOrder")
@@ -744,6 +748,25 @@ public class OMSController {
         return omsFeign.getAllLoadUnloadResult(mapValue);
     }
 
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEnd")
+    public Map<String, Object> getTimeTaskEnd(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEnd(mapValue);
+    }
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEndDetail")
+    public Map<String, Object> getTimeTaskEndDetail(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEndDetail(mapValue);
+    }
+
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getPauseTimeTaskDetail")
+    public Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId){
+        return omsFeign.getPauseTimeTaskDetail(orderId);
+    }
+
     @ApiOperation(value="批量关闭运输订单")
     @PostMapping("/batchCloseOrder")
     public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {

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

@@ -1817,9 +1817,10 @@ public class TMSController extends BaseRESTfulController {
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              String con
+                                              String con,
+                                              String  userId
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -2020,4 +2021,74 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
         return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
     }
+
+
+    @ApiOperation(value="新增计时作业实绩")
+    @PostMapping("/addTimeTaskResult")
+    public Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.addTimeTaskResult(map);
+    }
+
+    @ApiOperation(value="计时判断是否开始")
+    @PostMapping("/JudgeTimeTask")
+    public Map<String, Object> JudgeTimeTask(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTask(map);
+    }
+
+
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/unitSureEndTimeout")
+    public Map<String, Object> unitSureEndTimeout(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.unitSureEndTimeout(map);
+    }
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/JudgeTimeTaskPause")
+    public Map<String, Object> JudgeTimeTaskPause(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTaskPause(map);
+    }
+
+
+    @ApiOperation(value="对内转车辆装货点进行统计")
+    @PostMapping("/getLoading")
+    public Map<String, Object> getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime
+    ){
+        return tmsTruckFeign.getLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+    @ApiOperation(value="对内转车辆装卸货点进行统计")
+    @PostMapping("/getUnLoading")
+    public Map<String, Object> getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          String startTime,
+                                          String endTime
+    ){
+        return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
+
+
+
+
+
+    @ApiOperation(value="查询零星中转统计报表")
+    @PostMapping("/getLXInwardReport")
+    public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String startTime,
+                                           String endTime
+    ){
+        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
 }

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

@@ -545,8 +545,7 @@ public class WMSController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String con,
                                         String startTime,
-                                        String endTime
-                                      ) {
+                                        String endTime) {
         return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 
@@ -1015,5 +1014,12 @@ public class WMSController extends BaseRESTfulController {
                                         String endTime) {
         return wmsFeign.getWmsOutboundResultStatistics(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,con,startTime,endTime);
     }
+
+    //删除扫码吊牌
+    @PostMapping("/undoInbound")
+    @ApiOperation(value = "删除扫码吊牌")
+    public Map<String, Object> undoInbound(@RequestParam("inboundId") BigDecimal inboundId){
+        return wmsFeign.undoInbound(inboundId);
+    }
 }
 

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

@@ -1538,4 +1538,15 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
     Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amstrucksporadicorders/getSporadic")
+    Map<String, Object> getSporadic(@RequestParam Integer sporadicId);
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/getSporadicOfOrder")
+    Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        @RequestParam Integer apiId,
+                                                        @RequestParam Integer pageNum,
+                                                        @RequestParam Integer pageSize,
+                                                        @RequestParam Integer sporadicId);
 }

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

@@ -8,6 +8,7 @@ import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -393,6 +394,10 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
     Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
 
+    @ApiOperation(value = "根据运输订单号查询卸货点")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderWarehouseName")
+    Map<String, Object> getUnloadOrderWarehouseName(@RequestBody(required = false)Map<String, Object> map);
+
     @ApiOperation(value = "根据运输订单id查询物资")
     @PostMapping("api/v1/oms/omstruckorders/getOrderMaterialList")
     Map<String, Object> getOrderMaterialList(@RequestParam Integer orderId);
@@ -453,5 +458,15 @@ public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorderseparates/getTimeOrderResult")
     Map<String, Object> getTimeOrderResult(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEnd")
+
+
+    Map<String, Object> getTimeTaskEnd(@RequestBody Map<String, Object> mapValue);
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEndDetail")
+    Map<String, Object> getTimeTaskEndDetail(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
+    Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
 }
 

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

@@ -329,7 +329,8 @@ public interface TmsTruckFeign {
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con") String con);
+                                              @RequestParam("con") String con,
+                                              @RequestParam("userId") String userId);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -452,6 +453,51 @@ public interface TmsTruckFeign {
     //发送留皮计量委托
     @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
     Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
-    }
+
+
+    //新增计时作业实绩
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
+    Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
+    Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer apiId,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam String startTime,
+                                   @RequestParam String endTime);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
+    Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
+    Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/unitSureEndTimeout")
+    Map<String, Object> unitSureEndTimeout(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTaskPause")
+    Map<String, Object> JudgeTimeTaskPause(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLXInwardReport")
+    Map<String, Object> getLXInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
+}
+
+
+
+
 
 

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

@@ -875,4 +875,6 @@ public interface WMSFeign {
                                  @RequestParam String startTime,
                                  @RequestParam String endTime);
 
+    @PostMapping("/api/v1/wms/inboundResult/undoInbound")
+    Map<String, Object> undoInbound(@RequestParam BigDecimal inboundId);
 }

src/main/resources/application-dev.yml

@@ -30,9 +30,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:172.16.33.166:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.166:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:

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

@@ -352,12 +352,10 @@
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel"
-        FROM RMS_MATERIAL RM
-        <where>
-            <if test="index != null">
-                (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
-            </if>
-        </where>
+        FROM RMS_MATERIAL RM WHERE  RM.DELETED = 0
+        <if test="index != null">
+            AND (instr(RM.MATERIAL_NAME, #{index}) > 0 or instr(RM.MATERIAL_SPECIFICATION,#{index}) >0 or instr(RM.MATERIAL_MODEL,#{index}) >0)
+        </if>
         )
         <where>
             <if test="materialName != null">
@@ -545,9 +543,10 @@
 
 <!--  边输边查卸货点  -->
     <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
-        select Rw.WAREHOUSE_NAME "warehouseName",
+        select RW.WAREHOUSE_NAME "warehouseName",
                RW.WAREHOUSE_ID "warehouseId"
         from RMS_WAREHOUSE RW
+        where RW.DELETED = 0
         order by "warehouseName"
     </select>