发票修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/ReceiptOrReturnRespVO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.controller.supplierinvoiceRequest.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -12,6 +13,11 @@ public class ReceiptOrReturnRespVO {
      */
     private String poNumber;
 
+    /**
+     * 订单行
+     */
+    private String poLine;
+
     /**
      * 物料代码
      */
@@ -30,7 +36,17 @@ public class ReceiptOrReturnRespVO {
     /**
      * 单价
      */
-    private String singlePrice;
+    private BigDecimal singlePrice;
+
+    /**
+     * 数量
+     */
+    private BigDecimal qty;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
 
     /**
      * 备注

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereceiptRecord/PurchasereceiptRecordDetailConvert.java

@@ -8,6 +8,8 @@ import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRec
 import com.win.module.wms.controller.supplierinvoiceRequest.vo.ReceiptOrReturnRespVO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 
 import java.util.List;
@@ -36,5 +38,4 @@ public interface PurchasereceiptRecordDetailConvert {
 
     List<PurchasereceiptRecordDetailDO> convertList03(List<PurchasereceiptRecordDetailCreateReqVO> list);
 
-    List<ReceiptOrReturnRespVO> convertReceiptResp(List<PurchasereceiptRecordDetailDO> records);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchasereturnRecord/PurchasereturnRecordDetailConvert.java

@@ -36,5 +36,4 @@ public interface PurchasereturnRecordDetailConvert {
 
     List<PurchasereturnRecordDetailDO> convertList03(List<PurchasereturnRecordDetailCreateReqVO> list);
 
-    List<ReceiptOrReturnRespVO> convertReturnResp(List<PurchasereturnRecordDetailDO> records);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java

@@ -3,31 +3,25 @@ package com.win.module.wms.service.supplierinvoiceRequest;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.system.api.user.AdminUserApi;
-import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.supplierinvoiceRequest.vo.*;
-import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert;
-import com.win.module.wms.convert.purchasereturnRecord.PurchasereturnRecordDetailConvert;
+import com.win.module.wms.convert.supplierinvoiceRequest.SupplierinvoiceRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO;
-import com.win.module.wms.dal.mysql.purchaseclaimRecord.PurchaseclaimRecordDetailMapper;
+import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestDetailDO;
 import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper;
-import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper;
 import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordDetailMapper;
+import com.win.module.wms.dal.mysql.supplierinvoiceRequest.SupplierinvoiceRequestDetailMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.supplierinvoiceRequest.SupplierinvoiceRequestDetailConvert;
-import com.win.module.wms.dal.mysql.supplierinvoiceRequest.SupplierinvoiceRequestDetailMapper;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.SUPPLIERINVOICE_REQUEST_DETAIL_NOT_EXISTS;
 
 /**
  * 供应商发票申请子 Service 实现类
@@ -44,10 +38,6 @@ public class SupplierinvoiceRequestDetailServiceImpl implements SupplierinvoiceR
     private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper;
     @Resource
     private PurchasereturnRecordDetailMapper purchasereturnRecordDetailMapper;
-    @Resource
-    private PurchaseclaimRecordDetailMapper purchaseclaimRecordDetailMapper;
-    @Resource
-    private AdminUserApi userApi;
 
     @Override
     public Long createSupplierinvoiceRequestDetail(SupplierinvoiceRequestDetailCreateReqVO createReqVO) {
@@ -132,16 +122,44 @@ public class SupplierinvoiceRequestDetailServiceImpl implements SupplierinvoiceR
             queryWrapper.eq("po_number",pageReqVO.getPoNumber());
             Page<PurchasereceiptRecordDetailDO> receiptRecordPage = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
             purchasereceiptRecordDetailMapper.selectPage(receiptRecordPage,queryWrapper);
-            List<ReceiptOrReturnRespVO> receiptOrReturnRespVOList = PurchasereceiptRecordDetailConvert.INSTANCE.convertReceiptResp(receiptRecordPage.getRecords());
-            return new PageResult<>(receiptOrReturnRespVOList, receiptRecordPage.getTotal());
+            List<ReceiptOrReturnRespVO> list = new ArrayList<>();
+            for(PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO:receiptRecordPage.getRecords()){
+                ReceiptOrReturnRespVO receiptOrReturnRespVO = new ReceiptOrReturnRespVO();
+                receiptOrReturnRespVO.setPoNumber(purchasereceiptRecordDetailDO.getPoNumber());
+                receiptOrReturnRespVO.setPoLine(purchasereceiptRecordDetailDO.getPoLine());
+                receiptOrReturnRespVO.setItemCode(purchasereceiptRecordDetailDO.getItemCode());
+                receiptOrReturnRespVO.setBatch(purchasereceiptRecordDetailDO.getFromBatch());
+                receiptOrReturnRespVO.setSinglePrice(purchasereceiptRecordDetailDO.getSinglePrice());
+                receiptOrReturnRespVO.setQty(purchasereceiptRecordDetailDO.getQty());
+                receiptOrReturnRespVO.setAmount(purchasereceiptRecordDetailDO.getAmount());
+                receiptOrReturnRespVO.setRemark(purchasereceiptRecordDetailDO.getRemark());
+                receiptOrReturnRespVO.setCreator(purchasereceiptRecordDetailDO.getCreator());
+                receiptOrReturnRespVO.setCreateTime(purchasereceiptRecordDetailDO.getCreateTime());
+                list.add(receiptOrReturnRespVO);
+            }
+            return new PageResult<>(list, receiptRecordPage.getTotal());
         }else {
             QueryWrapper<PurchasereturnRecordDetailDO> returnRecordWrapper = new QueryWrapper<>();
             returnRecordWrapper.eq("number",pageReqVO.getRecordNumber());
             returnRecordWrapper.eq("po_number",pageReqVO.getPoNumber());
             Page<PurchasereturnRecordDetailDO> receiptRecordPage = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
             purchasereturnRecordDetailMapper.selectPage(receiptRecordPage,returnRecordWrapper);
-            List<ReceiptOrReturnRespVO> receiptOrReturnRespVOList = PurchasereturnRecordDetailConvert.INSTANCE.convertReturnResp(receiptRecordPage.getRecords());
-            return new PageResult<>(receiptOrReturnRespVOList, receiptRecordPage.getTotal());
+            List<ReceiptOrReturnRespVO> list = new ArrayList<>();
+            for(PurchasereturnRecordDetailDO purchasereturnRecordDetailDO:receiptRecordPage.getRecords()){
+                ReceiptOrReturnRespVO receiptOrReturnRespVO = new ReceiptOrReturnRespVO();
+                receiptOrReturnRespVO.setPoNumber(purchasereturnRecordDetailDO.getPoNumber());
+                receiptOrReturnRespVO.setPoLine(purchasereturnRecordDetailDO.getPoLine());
+                receiptOrReturnRespVO.setItemCode(purchasereturnRecordDetailDO.getItemCode());
+                receiptOrReturnRespVO.setBatch(purchasereturnRecordDetailDO.getFromBatch());
+                receiptOrReturnRespVO.setSinglePrice(purchasereturnRecordDetailDO.getSinglePrice());
+                receiptOrReturnRespVO.setQty(purchasereturnRecordDetailDO.getQty());
+                receiptOrReturnRespVO.setAmount(purchasereturnRecordDetailDO.getAmount());
+                receiptOrReturnRespVO.setRemark(purchasereturnRecordDetailDO.getRemark());
+                receiptOrReturnRespVO.setCreator(purchasereturnRecordDetailDO.getCreator());
+                receiptOrReturnRespVO.setCreateTime(purchasereturnRecordDetailDO.getCreateTime());
+                list.add(receiptOrReturnRespVO);
+            }
+            return new PageResult<>(list, receiptRecordPage.getTotal());
         }
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java

@@ -182,6 +182,10 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq
             supplierinvoiceRequestDetailDO.setMasterId(supplierdeliverRequestMainDO.getId());
             supplierinvoiceRequestDetailDO.setNumber(supplierdeliverRequestMainDO.getNumber());
             supplierinvoiceRequestDetailDO.setConvertRate(new BigDecimal(0));
+            supplierinvoiceRequestDetailDO.setRecordNumber(supplierdeliverRequestMainDO.getRecvBillNum());
+            supplierinvoiceRequestDetailDO.setPoNumber(supplierdeliverRequestMainDO.getPoBillNum());
+            supplierinvoiceRequestDetailDO.setBillType(supplierdeliverRequestMainDO.getBillType());
+
             supplierinvoiceRequestDetailDO.setId(null);
             supplierinvoiceRequestDetailDO.setCreator(null);
             supplierinvoiceRequestDetailDO.setCreateTime(null);