diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 7660b92f8..1dce77e80 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -109,7 +109,8 @@ public class OrderController { @Operation(summary = "还原") @Parameter(name = "orderId", description = "生产单id", required = true, example = "1") @PreAuthorize("@ss.hasPermission('executor:order:update')") - public CommonResult restoreOrder(@RequestParam("orderId") Long orderId) { + public CommonResult restoreOrder(@RequestBody JSONObject jsonObject) { + Long orderId = jsonObject.getLong("orderId"); orderService.restoreOrder(orderId); return success(true); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index bf92232a0..5881d3e35 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -378,6 +378,10 @@ public class OrderServiceImpl implements OrderService { if (plateGoodDO != null) {//存在 goodsDO.setGoodsId(plateGoodDO.getId()); } + + }else { // 没有goodsId 其他信息匹配 + + } Long plateGoods = (Long) identifierGenerator.nextId(null);