tijiaio

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

@@ -1168,6 +1168,20 @@ public class AMScontroller{
         return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,orgCode,index,startTime,endTime);
     }
 
+    @ApiModelProperty(value = "展示钢坯用车需求")
+    @PostMapping("/getBilletRequirementList")
+    public Map<String, Object> getBilletRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String orgCode, String index,String startTime,String endTime) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getBilletRequirementList(mapValue, pageNum, pageSize, apiId,orgCode,index,startTime,endTime);
+    }
+
+
     @PostMapping("/getPurRequirementList")
     public Map<String, Object> getPurRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
                                                        Integer pageNum,
@@ -2137,4 +2151,16 @@ public class AMScontroller{
     public Map<String,Object> getSaleOrderStatus(@RequestParam String saleNumber ) {
         return amsFeign.getSaleOrderStatus(saleNumber);
     }
+
+    @ApiOperation("关闭截止日期,停止推送订单")
+    @PostMapping("/closeDueDate")
+    public Map<String,Object> closeDueDate(@RequestParam BigDecimal requirementId) {
+        return amsFeign.closeDueDate(requirementId);
+    }
+
+    @ApiOperation("钢坯需求计划派单")
+    @PostMapping("/addBilletRequirement")
+    public RESTfulResult addBilletRequirement(@RequestBody Map<String,Object> map) {
+        return amsFeign.addBilletRequirement(map);
+    }
 }

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

@@ -2706,10 +2706,6 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getSteelReportDetailsBySmId(saleOrderMaterialId);
     }
 
-//    @ApiOperation(value="测试-新增计费详单")
-//    @PostMapping("/genernateInwardTime")
-//    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map){
-//        return  tmsTruckFeign.genernateInwardTime(map);
-//    }
+
 
 }

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

@@ -1814,4 +1814,19 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderStatus")
     Map<String, Object> getSaleOrderStatus(@RequestParam String saleNumber);
 
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/closeDueDate")
+    Map<String, Object> closeDueDate(@RequestParam BigDecimal requirementId);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/addBilletRequirement")
+    RESTfulResult addBilletRequirement(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getBilletRequirementList")
+    Map<String, Object> getBilletRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam String orgCode,
+                                                 @RequestParam String index,
+                                                 @RequestParam String startTime,
+                                                 @RequestParam String endTime);
 }

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

@@ -766,8 +766,7 @@ public interface TmsTruckFeign {
     @PostMapping("/api/v1/truckTms/statisticalReport/getSteelReportDetailsBySmId")
     Map<String, Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId);
 
-  /* @PostMapping("/api/v1/truckTms/tmstrucktimetaskresults/genernateInwardTime")
-    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map);*/
+
 
 }
 

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -28,9 +28,10 @@ import java.util.*;
  * @ author    :TXF
  * @ time      :2021/10/19 18:05
  */
+
+@Service
 @EnableScheduling
 @EnableAsync
-@Service
 public class UniversalServiceImpl implements UniversalService {
 
     @Resource
@@ -241,6 +242,7 @@ public class UniversalServiceImpl implements UniversalService {
      */
     @Scheduled(cron = "0 0 8 * * ?")
     public void closePassedOrder() {
+        System.out.println("我在十一点被执行");
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
         int result = universalMapper.closePassedOrder();
@@ -263,8 +265,8 @@ public class UniversalServiceImpl implements UniversalService {
         }catch (Exception e){
 
         }
-
         System.out.println("订单关闭数为：" + result);
+        //return 1;
     }
 
 

src/main/resources/application-prod.yml

@@ -9,21 +9,21 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
     url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout