From b55bd26c5a6bc2cfbf796c737d52d7f6b978c054 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Mon, 23 Mar 2026 22:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BB=99=E9=83=A8=E5=88=86sap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/InCostCenterBackController.java | 8 ++++++++ .../admin/controller/InProduceBackController.java | 8 ++++++++ .../admin/controller/InProduceOrderController.java | 7 +++++++ .../wms/admin/controller/OptRecordController.java | 5 +++-- .../admin/controller/OutAssistanceController.java | 12 ++++++++++++ .../admin/controller/TransferFactoryController.java | 7 +++++++ 6 files changed, 45 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java index a4a17a93..3cac125e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java @@ -19,6 +19,7 @@ import com.nflg.wms.common.pojo.document.InMaterialScanRecord; import com.nflg.wms.common.pojo.dto.C_MaterialReturnDTO; import com.nflg.wms.common.pojo.dto.DepartmentMaterialReturnSlipDTO; import com.nflg.wms.common.pojo.dto.InventoryInDTO; +import com.nflg.wms.common.pojo.dto.OptRecordDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.*; import com.nflg.wms.common.util.UserUtil; @@ -82,6 +83,9 @@ public class InCostCenterBackController extends BaseController { @Resource private IWmsWarehouseService warehouseService; + @Resource + private OptRecordController optRecordController; + /** * 查询SAP领料订单数据 */ @@ -340,6 +344,10 @@ public class InCostCenterBackController extends BaseController { }).toList() ) ); + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short)1); + optRecordDTO.setOrderId(ticket.getNo()); + optRecordController.add(optRecordDTO); ticket.setDocYear(vo.getEMJahr()); ticket.setMatDoc(vo.getEMblnr()); inCostcenterBackTicketService.save(ticket); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java index d09fe842..ffc18007 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java @@ -83,6 +83,9 @@ public class InProduceBackController extends BaseController { @Resource private IWmsWarehouseService warehouseService; + @Resource + private OptRecordController optRecordController; + /** * 查询SAP领料订单数据 */ @@ -355,6 +358,11 @@ public class InProduceBackController extends BaseController { .setSernr(it.getValue())).toList() ) ); + + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short)1); + optRecordDTO.setOrderId(ticket.getNo()); + optRecordController.add(optRecordDTO); BigDecimal totalNum = datas.stream().map(WmsInProduceBackItem::getSqsl).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal inNum = datas.stream().map(WmsInProduceBackItem::getNum).reduce(BigDecimal.ZERO, BigDecimal::add); inProduceBackService.lambdaUpdate() 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 881ab931..217ea9e4 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 @@ -113,6 +113,9 @@ public class InProduceOrderController extends BaseController { @Resource private IWmsWarehouseService warehouseService; + @Resource + private OptRecordController optRecordController; + /** * 从SAP查询生产订单信息 * @param no 生产订单号 @@ -579,6 +582,10 @@ public class InProduceOrderController extends BaseController { } //同步入库信息到SAP Zwm00Mb107DTO dto = sapService.zwm00_mb107(order.getOrderNo(), UserUtil.getUserName(), input1, sernrs); + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short)1); + optRecordDTO.setOrderId(order.getNo()); + optRecordController.add(optRecordDTO); order.setMblnr(dto.getE_MBLNR()); order.setMjahr(dto.getE_MJAHR()); order.setState((short) 1); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java index 6134fa90..6866790c 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java @@ -1,6 +1,7 @@ package com.nflg.wms.admin.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.OptRecordDTO; import com.nflg.wms.common.pojo.qo.OptRecordQO; @@ -36,8 +37,8 @@ public class OptRecordController { * @return */ @PostMapping("search") - public List searchRecord(@Valid @RequestBody OptRecordQO optRecordQO){ - return optRecordService.search(optRecordQO); + public ApiResult> searchRecord(@Valid @RequestBody OptRecordQO optRecordQO){ + return ApiResult.success(optRecordService.search(optRecordQO)); } /** diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 0b5f027e..54064516 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -90,6 +90,9 @@ public class OutAssistanceController extends BaseController { @Resource private RedissonClient redissonClient; + @Resource + private OptRecordController optRecordController; + /** * 查询SAP领料订单数据 */ @@ -387,6 +390,10 @@ public class OutAssistanceController extends BaseController { }); qrCodeMasterService.updateBarCode(qrCodeMasters); submitSap(order, ticket, records, datas, qrCodeMasters); + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short)1); + optRecordDTO.setOrderId(request.getNo()); + optRecordController.add(optRecordDTO); } else { inventoryForOutRepository.saveAll(request.getRecommendBatch() .stream() @@ -447,6 +454,7 @@ public class OutAssistanceController extends BaseController { }).toList() ) ); + outAssistanceTicketService.lambdaUpdate() .set(WmsOutAssistanceTicket::getMatDoc, dto.getMatDoc()) .set(WmsOutAssistanceTicket::getDocYear, dto.getDocYear()) @@ -532,6 +540,10 @@ public class OutAssistanceController extends BaseController { }); qrCodeMasterService.updateBarCode(qrCodeMasters); submitSap(order, ticket, records, outAssistanceItemService.getList(order.getId()), qrCodeMasters); + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short)1); + optRecordDTO.setOrderId(ticket.getNo()); + optRecordController.add(optRecordDTO); } else { List items = outAssistanceTicketItemService.getList(qo.getId()); items.forEach(it -> { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index 8923a3d7..2bc0799d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -102,6 +102,9 @@ public class TransferFactoryController extends BaseController { @Resource private RedissonClient redissonClient; + @Resource + private OptRecordController optRecordController; + /** * 查询SAP领料订单数据 */ @@ -718,6 +721,10 @@ public class TransferFactoryController extends BaseController { .toList() ) ); + OptRecordDTO optRecordDTO = new OptRecordDTO(); + optRecordDTO.setOperationType((short)1); + optRecordDTO.setOrderId(ticket.getNo()); + optRecordController.add(optRecordDTO); transferFactoryTicketService.lambdaUpdate() .set(WmsTransferFactoryTicket::getMatDoc, vo.getEMblnr()) .set(WmsTransferFactoryTicket::getDocYear, vo.getEMjahr())