mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
修改传参类型
This commit is contained in:
+2
-1
@@ -109,7 +109,8 @@ public class OrderController {
|
|||||||
@Operation(summary = "还原")
|
@Operation(summary = "还原")
|
||||||
@Parameter(name = "orderId", description = "生产单id", required = true, example = "1")
|
@Parameter(name = "orderId", description = "生产单id", required = true, example = "1")
|
||||||
@PreAuthorize("@ss.hasPermission('executor:order:update')")
|
@PreAuthorize("@ss.hasPermission('executor:order:update')")
|
||||||
public CommonResult<Boolean> restoreOrder(@RequestParam("orderId") Long orderId) {
|
public CommonResult<Boolean> restoreOrder(@RequestBody JSONObject jsonObject) {
|
||||||
|
Long orderId = jsonObject.getLong("orderId");
|
||||||
orderService.restoreOrder(orderId);
|
orderService.restoreOrder(orderId);
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -378,6 +378,10 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
if (plateGoodDO != null) {//存在
|
if (plateGoodDO != null) {//存在
|
||||||
goodsDO.setGoodsId(plateGoodDO.getId());
|
goodsDO.setGoodsId(plateGoodDO.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}else { // 没有goodsId 其他信息匹配
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Long plateGoods = (Long) identifierGenerator.nextId(null);
|
Long plateGoods = (Long) identifierGenerator.nextId(null);
|
||||||
|
|||||||
Reference in New Issue
Block a user