nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java

@@ -19,7 +19,6 @@ 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;
@@ -83,9 +82,6 @@ public class InCostCenterBackController extends BaseController {
     @Resource
     private IWmsWarehouseService warehouseService;
 
-    @Resource
-    private OptRecordController optRecordController;
-
     /**
      * 查询SAP领料订单数据
      */
@@ -344,10 +340,6 @@ 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);

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java

@@ -83,9 +83,6 @@ public class InProduceBackController extends BaseController {
     @Resource
     private IWmsWarehouseService warehouseService;
 
-    @Resource
-    private OptRecordController optRecordController;
-
     /**
      * 查询SAP领料订单数据
      */
@@ -358,11 +355,6 @@ 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()

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java

@@ -113,9 +113,6 @@ public class InProduceOrderController extends BaseController {
     @Resource
     private IWmsWarehouseService warehouseService;
 
-    @Resource
-    private OptRecordController optRecordController;
-
     /**
      * 从SAP查询生产订单信息
      * @param no 生产订单号
@@ -582,10 +579,6 @@ 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);

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OptRecordController.java

@@ -1,7 +1,6 @@
 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;
@@ -37,8 +36,8 @@ public class OptRecordController {
      * @return
      */
     @PostMapping("search")
-    public ApiResult<List<OptRecordVO>> searchRecord(@Valid @RequestBody OptRecordQO optRecordQO){
+    public List<OptRecordVO> searchRecord(@Valid @RequestBody OptRecordQO optRecordQO){
-        return ApiResult.success(optRecordService.search(optRecordQO));
+        return optRecordService.search(optRecordQO);
     }
 
     /**

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java

@@ -91,9 +91,6 @@ public class OutAssistanceController extends BaseController {
     @Resource
     private RedissonClient redissonClient;
 
-    @Resource
-    private OptRecordController optRecordController;
-
     /**
      * 查询SAP领料订单数据
      */
@@ -393,10 +390,6 @@ 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()
@@ -457,7 +450,6 @@ public class OutAssistanceController extends BaseController {
                         }).toList()
                 )
         );
-
         outAssistanceTicketService.lambdaUpdate()
                 .set(WmsOutAssistanceTicket::getMatDoc, dto.getMatDoc())
                 .set(WmsOutAssistanceTicket::getDocYear, dto.getDocYear())
@@ -543,10 +535,6 @@ 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<OutAssistanceItemVO> items = outAssistanceTicketItemService.getList(qo.getId());
                 items.forEach(it -> {

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java

@@ -103,9 +103,6 @@ public class TransferFactoryController extends BaseController {
     @Resource
     private RedissonClient redissonClient;
 
-    @Resource
-    private OptRecordController optRecordController;
-
     /**
      * 查询SAP领料订单数据
      */
@@ -724,10 +721,6 @@ 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())