From b2df047dbc3cbfd014b67c8f7432d48a672d2c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 11 Jun 2026 14:28:39 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=88=90=E5=93=81=E8=AE=A2=E5=8D=953?= =?UTF-8?q?1=E7=89=A9=E6=96=99=E4=B8=8D=E8=B4=A8=E6=A3=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8e3031dac0634ae1c4b5b9e8e99e85bf4822dae3. --- .../controller/InProduceOrderController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index aca8e634..d4979fe9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -124,10 +124,10 @@ public class InProduceOrderController extends BaseController { @Transactional @PostMapping("save") public ApiResult save(@Valid @RequestBody InProduceOrderGenerateMaterialsQO request) { -// if (request.isNeedInspection()) { -// VUtil.trueThrowBusinessError(StrUtil.isBlank(request.getModelNo()) || StrUtil.isBlank(request.getWorkbenchNo())) -// .throwMessage("机型编号和机台编号不能为空"); -// } + if (request.isNeedInspection()) { + VUtil.trueThrowBusinessError(StrUtil.isBlank(request.getModelNo()) || StrUtil.isBlank(request.getWorkbenchNo())) + .throwMessage("机型编号和机台编号不能为空"); + } WmsInProduceOrder order = new WmsInProduceOrder() .setId(IdUtil.getSnowflakeNextId()) .setDataType(request.getDataType()) @@ -154,8 +154,8 @@ public class InProduceOrderController extends BaseController { .setBatchNo(date + index) .setSernr(request.getSernr()) .setWorkbenchNo(request.getWorkbenchNo()) - .setModelNo(request.getModelNo()); -// .setInspectionStatus(request.isNeedInspection() ? 0 : null); + .setModelNo(request.getModelNo()) + .setInspectionStatus(request.isNeedInspection() ? 0 : null); produceOrderItemService.save(parent); if (request.getList()) { List children = bomService.getChildren(request.getMatnr()); @@ -213,9 +213,9 @@ public class InProduceOrderController extends BaseController { .setCreateTime(LocalDateTime.now()) ); } -// if (request.isNeedInspection()) { -// qmsService.pushPdiInspection(order.getOrderNo(), parent); -// } + if (request.isNeedInspection()) { + qmsService.pushPdiInspection(order.getOrderNo(), parent); + } return ApiResult.success(order.getId()); }