Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsBlankOrderController.java

@@ -45,6 +45,7 @@ public class ApsBlankOrderController {
 
     /**
      * 重新排程
+     *
      * @return
      */
     @GetMapping("/apsReScheduling")
@@ -55,6 +56,7 @@ public class ApsBlankOrderController {
 
     /**
      * 坯料计划锁定解锁
+     *
      * @param
      * @return
      */
@@ -65,6 +67,7 @@ public class ApsBlankOrderController {
 
     /**
      * 订单排程取消
+     *
      * @param
      * @return
      */
@@ -76,17 +79,18 @@ public class ApsBlankOrderController {
 
     /**
      * 坯料计划排程取消
+     *
      * @return
      */
     @PostMapping("/blankApsCancel")
-    public R blankApsCancel(@RequestBody List<String> apsBlankIds){
+    public R blankApsCancel(@RequestBody List<String> apsBlankIds) {
         apsBlankOrderService.blankApsCancel(apsBlankIds);
         return R.ok();
     }
 
 
     @PostMapping("/test")
-    public R test(){
+    public R test() {
         apsBlankOrderService.test();
         return R.ok();
     }
@@ -98,18 +102,19 @@ public class ApsBlankOrderController {
      * @return
      */
     @PostMapping("/publish")
-    public R publish(@RequestBody List<String> blankIds){
+    public R publish(@RequestBody List<String> blankIds) {
         log.info("发布id为: {}的坯料计划", blankIds);
         return apsBlankOrderService.publish(blankIds);
     }
 
     /**
      * 坯料计划取消发布
+     *
      * @param blankIds
      * @return
      */
     @PostMapping("/publish/cancel")
-    public R publishCancel(@RequestBody List<String> blankIds){
+    public R publishCancel(@RequestBody List<String> blankIds) {
         log.info("取消发布id为: {}的坯料计划", blankIds);
         return apsBlankOrderService.publishCancel(blankIds);
     }
@@ -134,22 +139,16 @@ public class ApsBlankOrderController {
      * 校验和保存坯料计划
      */
     @PostMapping("/checkAndSaveOrUpdateBlank")
-    public R checkAndSaveOrUpdateBlank(@RequestBody CheckAndSaveOrUpdateBlankReq req){
-        try {
-            log.info("校验并保存坯料计划");
-            return apsBlankOrderService.checkAndSaveOrUpdateBlank(req);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("校验和保存坯料计划异常："+e.getMessage());
-            return R.error("校验和保存坯料计划异常："+e.getMessage());
-        }
+    public R checkAndSaveOrUpdateBlank(@RequestBody CheckAndSaveOrUpdateBlankReq req) {
+        log.info("校验并保存坯料计划,入参为：{}", req);
+        return apsBlankOrderService.checkAndSaveOrUpdateBlank(req);
     }
 
     /**
      * 取消坯料计划
      */
     @PostMapping("/removeBlankOrder")
-    public R removeBlankOrder(@RequestBody ApsBlankOrderDo req){
+    public R removeBlankOrder(@RequestBody ApsBlankOrderDo req) {
         log.info("removeBlankOrder 取消ID为：{}的坯料计划", req.getId());
         return apsBlankOrderService.removeBlankOrder(req);
     }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductionOrderController.java

@@ -57,14 +57,9 @@ public class ApsProductionOrderController {
      */
     @PostMapping("/checkAndSaveOrUpdateOrder")
     public R checkAndSaveOrUpdateOrder(@RequestBody CheckAndSaveOrUpdateOrderReq req) {
-        try {
-            log.info("订单评审，提交计划评审（校验和保存），入参为:{}", req);
-            return apsProductionOrderService.checkAndSaveOrUpdateOrder(req);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return R.error("校验失败，请检查是否有必填项未填");
-        }
 
+        log.info("订单评审，提交计划评审（校验和保存），入参为:{}", req);
+        return apsProductionOrderService.checkAndSaveOrUpdateOrder(req);
     }
 
     /*