Merge pull request #192 from Jzow/master

add purchase detail views
wansenai · Nov 13, 2023 · ec48510 · ec48510
2 parents 2ee633f + 1f8b3ca
commit ec48510
Show file tree

Hide file tree

Showing 42 changed files with 1,782 additions and 87 deletions.
diff --git a/core/api/src/main/java/com/wansenai/api/receipt/PurchaseController.java b/core/api/src/main/java/com/wansenai/api/receipt/PurchaseController.java
@@ -54,6 +54,11 @@ public Response<PurchaseOrderDetailVO> detail(@PathVariable("id") Long id) {
         return purchaseService.getPurchaseOrderDetail(id);
     }
 
+    @GetMapping("/order/getLinkOrderDetail/{receiptNumber}")
+    public Response<PurchaseOrderDetailVO> getLinkPurchaseOrderDetail(@PathVariable("receiptNumber") String receiptNumber) {
+        return purchaseService.getLinkPurchaseOrderDetail(receiptNumber);
+    }
+
     @PutMapping("/order/updateStatus/{ids}/{status}")
     public Response<String> updateStatus(@PathVariable("ids") List<Long> ids, @PathVariable("status") Integer status) {
         return purchaseService.updatePurchaseOrderStatus(ids, status);
@@ -79,6 +84,11 @@ public Response<PurchaseStorageDetailVO> purchaseStorageDetail(@PathVariable("id
         return purchaseService.getPurchaseStorageDetail(id);
     }
 
+    @GetMapping("/storage/getLinkStorageDetail/{receiptNumber}")
+    public Response<PurchaseStorageDetailVO> getLinkPurchaseStorageDetail(@PathVariable("receiptNumber") String receiptNumber) {
+        return purchaseService.getLinkPurchaseStorageDetail(receiptNumber);
+    }
+
     @PutMapping("/storage/updateStatus/{ids}/{status}")
     public Response<String> updatePurchaseStorageStatus(@PathVariable("ids") List<Long> ids, @PathVariable("status") Integer status) {
         return purchaseService.updatePurchaseStorageStatus(ids, status);
@@ -104,6 +114,11 @@ public Response<PurchaseRefundDetailVO> purchaseRefundDetail(@PathVariable("id")
         return purchaseService.getPurchaseRefundDetail(id);
     }
 
+    @GetMapping("/refund/getLinkRefundDetail/{receiptNumber}")
+    public Response<PurchaseRefundDetailVO> getLinkPurchaseRefundDetail(@PathVariable("receiptNumber") String receiptNumber) {
+        return purchaseService.getLinkPurchaseRefundDetail(receiptNumber);
+    }
+
     @PutMapping("/refund/updateStatus/{ids}/{status}")
     public Response<String> updatePurchaseRefundStatus(@PathVariable("ids") List<Long> ids, @PathVariable("status") Integer status) {
         return purchaseService.updatePurchaseRefundStatus(ids, status);

diff --git a/core/api/src/main/java/com/wansenai/api/receipt/SalesController.java b/core/api/src/main/java/com/wansenai/api/receipt/SalesController.java
@@ -47,6 +47,11 @@ public Response<SaleOrderDetailVO> detail(@PathVariable("id") Long id) {
         return receiptSaleService.getSaleOrderDetail(id);
     }
 
+    @GetMapping("/order/getLinkOrderDetail/{receiptNumber}")
+    public Response<SaleOrderDetailVO> getLinkOrderDetail(@PathVariable("receiptNumber") String receiptNumber) {
+        return receiptSaleService.getLinkSaleOrderDetail(receiptNumber);
+    }
+
     @PutMapping("/order/updateStatus/{ids}/{status}")
     public Response<String> updateStatus(@PathVariable("ids") List<Long> ids, @PathVariable("status") Integer status) {
         return receiptSaleService.updateSaleOrderStatus(ids, status);
@@ -72,6 +77,11 @@ public Response<SaleShipmentsDetailVO> shipmentsDetail(@PathVariable("id") Long
         return receiptSaleService.getSaleShipmentsDetail(id);
     }
 
+    @GetMapping("/shipments/getLinkShipmentDetail/{receiptNumber}")
+    public Response<SaleShipmentsDetailVO> getLinkShipmentDetail(@PathVariable("receiptNumber") String receiptNumber) {
+        return receiptSaleService.getLinkSaleShipmentsDetail(receiptNumber);
+    }
+
     @PutMapping("/shipments/updateStatus/{ids}/{status}")
     public Response<String> updateShipmentsStatus(@PathVariable("ids") List<Long> ids, @PathVariable("status") Integer status) {
         return receiptSaleService.updateSaleShipmentsStatus(ids, status);
@@ -97,6 +107,11 @@ public Response<SaleRefundDetailVO> refundDetail(@PathVariable("id") Long id) {
         return receiptSaleService.getSaleRefundDetail(id);
     }
 
+    @GetMapping("/refund/getLinkRefundDetail/{receiptNumber}")
+    public Response<SaleRefundDetailVO> getLinkRefundDetail(@PathVariable("receiptNumber") String receiptNumber) {
+        return receiptSaleService.getLinkSaleRefundDetail(receiptNumber);
+    }
+
     @PutMapping("/refund/updateStatus/{ids}/{status}")
     public Response<String> updateRefundStatus(@PathVariable("ids") List<Long> ids, @PathVariable("status") Integer status) {
         return receiptSaleService.updateSaleRefundStatus(ids, status);

diff --git a/core/domain/src/main/java/com/wansenai/bo/PurchaseDataBO.java b/core/domain/src/main/java/com/wansenai/bo/PurchaseDataBO.java
@@ -30,6 +30,8 @@ public class PurchaseDataBO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long warehouseId;
 
+    private String warehouseName;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long barCode;
 
@@ -39,8 +41,12 @@ public class PurchaseDataBO {
 
     private String productUnit;
 
+    private String productModel;
+
     private String productStandard;
 
+    private String productColor;
+
     private Integer stock;
 
     private Integer productNumber;

diff --git a/core/domain/src/main/java/com/wansenai/bo/SalesDataBO.java b/core/domain/src/main/java/com/wansenai/bo/SalesDataBO.java
@@ -30,15 +30,21 @@ public class SalesDataBO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long warehouseId;
 
+    private String warehouseName;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long barCode;
 
     private Long productId;
 
     private String productName;
 
+    private String productModel;
+
     private String productUnit;
 
+    private String productColor;
+
     private String productStandard;
 
     private Integer stock;

diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/purchase/PurchaseOrderDetailVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/purchase/PurchaseOrderDetailVO.java
@@ -35,6 +35,8 @@ public class PurchaseOrderDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long supplierId;
 
+    private String supplierName;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long accountId;
 
@@ -49,6 +51,8 @@ public class PurchaseOrderDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private List<Long> multipleAccountIds;
 
+    private String accountName;
+
     @JsonSerialize(using = BigDecimalSerializerBO.class)
     private BigDecimal discountRate;
 
@@ -66,4 +70,6 @@ public class PurchaseOrderDetailVO {
     private List<FileDataBO> files;
 
     private String remark;
+
+    private Integer status;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/purchase/PurchaseRefundDetailVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/purchase/PurchaseRefundDetailVO.java
@@ -35,6 +35,8 @@ public class PurchaseRefundDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long supplierId;
 
+    private String supplierName;
+
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -69,6 +71,8 @@ public class PurchaseRefundDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private List<Long> multipleAccountIds;
 
+    private String accountName;
+
     private List<PurchaseDataBO> tableData;
 
     private List<FileDataBO> files;

diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/purchase/PurchaseStorageDetailVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/purchase/PurchaseStorageDetailVO.java
@@ -35,6 +35,8 @@ public class PurchaseStorageDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long supplierId;
 
+    private String supplierName;
+
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -69,6 +71,8 @@ public class PurchaseStorageDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private List<Long> multipleAccountIds;
 
+    private String accountName;
+
     private List<PurchaseDataBO> tableData;
 
     private List<FileDataBO> files;

diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/sale/SaleOrderDetailVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/sale/SaleOrderDetailVO.java
@@ -35,9 +35,15 @@ public class SaleOrderDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long customerId;
 
+    private String customerName;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long accountId;
 
+    private String accountName;
+
+    private String otherReceipt;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime receiptDate;
 
@@ -69,4 +75,6 @@ public class SaleOrderDetailVO {
     private List<FileDataBO> files;
 
     private String remark;
+
+    private Integer status;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/sale/SaleRefundDetailVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/sale/SaleRefundDetailVO.java
@@ -35,6 +35,10 @@ public class SaleRefundDetailVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long customerId;
 
+    private String customerName;
+
+    private String accountName;
+
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

diff --git a/core/domain/src/main/java/com/wansenai/vo/receipt/sale/SaleShipmentsDetailVO.java b/core/domain/src/main/java/com/wansenai/vo/receipt/sale/SaleShipmentsDetailVO.java
@@ -37,6 +37,10 @@ public class SaleShipmentsDetailVO {
 
     private String receiptNumber;
 
+    private String customerName;
+
+    private String accountName;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime receiptDate;
 
@@ -77,4 +81,6 @@ public class SaleShipmentsDetailVO {
     private List<FileDataBO> files;
 
     private String remark;
+
+    private Integer status;
 }
diff --git a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptPurchaseService.java b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptPurchaseService.java
@@ -45,6 +45,17 @@ public interface ReceiptPurchaseService extends IService<ReceiptPurchaseMain> {
      */
     Response<PurchaseOrderDetailVO> getPurchaseOrderDetail(Long id);
 
+    /**
+     * Query purchase order details data based on purchase order number
+     * 根据采购订单单号查询采购订单详情数据
+     *
+     * @param receiptNumber Purchase order number
+     *                      采购订单单号
+     * @return  Returns purchase order details data
+     *       返回采购订单详情数据
+     */
+    Response<PurchaseOrderDetailVO> getLinkPurchaseOrderDetail(String receiptNumber);
+
     /**
      * Add/Update Purchase Order Data
      * 添加/修改采购订单数据
@@ -102,6 +113,17 @@ public interface ReceiptPurchaseService extends IService<ReceiptPurchaseMain> {
      */
     Response<PurchaseStorageDetailVO> getPurchaseStorageDetail(Long id);
 
+    /**
+     * Query the detailed data of the purchase receipt order based on the purchase receipt order number
+     * 根据采购入库单单号查询采购入库单详情数据
+     *
+     * @param receiptNumber Purchase receipt order number
+     *                      采购入库单单号
+     * @return Returns purchase receipt order details data
+     *     返回采购入库单详情数据
+     */
+    Response<PurchaseStorageDetailVO> getLinkPurchaseStorageDetail(String receiptNumber);
+
     /**
      * Add/Modify Purchase Receipt Data
      * 添加/修改采购入库数据
@@ -159,6 +181,17 @@ public interface ReceiptPurchaseService extends IService<ReceiptPurchaseMain> {
      */
     Response<PurchaseRefundDetailVO> getPurchaseRefundDetail(Long id);
 
+    /**
+     * Query the detailed data of the purchase return order based on the purchase return order number
+     * 根据采购退货单单号查询采购退货单详情数据
+     *
+     * @param receiptNumber Purchase return order number
+     *                      采购退货单单号
+     * @return Returns purchase return order details data
+     *     返回采购退货单详情数据
+     */
+    Response<PurchaseRefundDetailVO> getLinkPurchaseRefundDetail(String receiptNumber);
+
     /**
      * Add/Modify Purchase Return Order Data
      * 添加/修改采购退货单数据

diff --git a/core/service/src/main/java/com/wansenai/service/receipt/ReceiptSaleService.java b/core/service/src/main/java/com/wansenai/service/receipt/ReceiptSaleService.java
@@ -45,6 +45,17 @@ public interface ReceiptSaleService extends IService<ReceiptSaleMain> {
      */
     Response<SaleOrderDetailVO> getSaleOrderDetail(Long id);
 
+    /**
+     * Query sales order details data based on sales order number
+     * 根据销售订单编号查询销售订单详情数据
+     *
+     * @param receiptNumber Sales order number
+     *                      销售订单编号
+     * @return  Returns sales order details data
+     *         返回销售订单详情数据
+     */
+    Response<SaleOrderDetailVO> getLinkSaleOrderDetail(String receiptNumber);
+
     /**
      * Add/Update Sales Order Data
      * 新增/修改 销售订单数据
@@ -101,6 +112,17 @@ public interface ReceiptSaleService extends IService<ReceiptSaleMain> {
      */
     Response<SaleShipmentsDetailVO> getSaleShipmentsDetail(Long id);
 
+    /**
+     * Query sales delivery order details data based on sales delivery order number
+     * 根据销售出货单编号查询销售出货单详情数据
+     *
+     * @param receiptNumber Sales delivery order number
+     *                      销售出货单编号
+     * @return Returns sales delivery order details data
+     *        返回销售出货单详情数据
+     */
+    Response<SaleShipmentsDetailVO> getLinkSaleShipmentsDetail(String receiptNumber);
+
     /**
      * Add or modify sales delivery orders
      * 新增或修改销售出货单
@@ -158,6 +180,17 @@ public interface ReceiptSaleService extends IService<ReceiptSaleMain> {
      */
     Response<SaleRefundDetailVO> getSaleRefundDetail(Long id);
 
+    /**
+     * Query sales return order details data based on sales return order number
+     * 根据销售退货单编号查询销售退货单详情数据
+     *
+     * @param receiptNumber Sales return order number
+     *                      销售退货单编号
+     * @return Returns sales return order details data
+     *        返回销售退货单详情数据
+     */
+    Response<SaleRefundDetailVO> getLinkSaleRefundDetail(String receiptNumber);
+
     /**
      * Add or modify sales refund orders
      * 新增或修改销售退货单