diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java index 2c7d71ac..ae3e00eb 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java @@ -44,5 +44,9 @@ public class MaterialDestroyPageReqVO extends PageParam { @Schema(description = "是否启用") private String isEnable; + @Schema(description = "收货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String receiveUnit; + @Schema(description = "发货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String sendUnit; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java index 69b57f46..a330ac7c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java @@ -56,5 +56,11 @@ public class MaterialDestroyRespVO { @Schema(description = "是否启用") @ExcelProperty("是否启用") private String isEnable; + @Schema(description = "收货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("收货单位") + private String receiveUnit; + @Schema(description = "发货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("发货单位") + private String sendUnit; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java index e596df3f..20a20ad4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java @@ -47,5 +47,9 @@ public class MaterialDestroySaveReqVO { @Schema(description = "是否启用") private String isEnable; + @Schema(description = "收货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String receiveUnit; + @Schema(description = "发货单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + private String sendUnit; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java index 2b8cebd4..fa69f2a8 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java @@ -109,4 +109,14 @@ public class MaterialDestroyDO extends BusinessBaseDO { @TableField("IS_ENB") private String isEnable; + /** + * 发货计量单位 + */ + @TableField("SND_UNT") + private String sendUnit; + /** + * 收货计量单位 + */ + @TableField("RCV_UNT") + private String receiveUnit; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java index 121a4be2..128fe138 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java @@ -26,6 +26,8 @@ public interface MaterialDestroyMapper extends BaseMapperX { .betweenIfPresent(MaterialDestroyDO::getCreateTime, reqVO.getCreateTime()) .likeIfPresent(MaterialDestroyDO::getSupplierNumber, reqVO.getSupplierNumber()) .likeIfPresent(MaterialDestroyDO::getSupplierName, reqVO.getSupplierName()) + .likeIfPresent(MaterialDestroyDO::getSendUnit, reqVO.getSendUnit()) + .likeIfPresent(MaterialDestroyDO::getReceiveUnit, reqVO.getReceiveUnit()) .eqIfPresent(MaterialDestroyDO::getIsEnable, reqVO.getIsEnable()) .orderByDesc(MaterialDestroyDO::getId)); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java index 75aa7208..0a89d45e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.controller.admin.entrustorder.vo; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import lombok.*; import java.util.*; @@ -30,14 +31,16 @@ public class EntrustOrderDetailPageReqVO extends PageParam { @Schema(description = "收货库位编码") private String receiveWarehouseNumber; - @Schema(description = "物料名称", example = "赵六") - private String materialName; +// @Schema(description = "物料名称", example = "赵六") +// private String materialName; +// +// @Schema(description = "物料编码") +// private String materialNumber; - @Schema(description = "物料编码") - private String materialNumber; - - @Schema(description = "计量单位") - private String uom; + @Schema(description = "发货计量单位") + private String sendUnit; + @Schema(description = "收货计量单位") + private String receiveUnit; @Schema(description = "暂估数量") private BigDecimal forecastQuantity; @@ -85,5 +88,16 @@ public class EntrustOrderDetailPageReqVO extends PageParam { private String accountingItemAllocation; @Schema(description = "备注") private String remark; + @Schema(description = "收货物料编码") + private String receiveMaterialNumber; + @Schema(description = "收货物料名称") + private String receiveMaterialName; + @Schema(description = "发货物料编码") + private String sendMaterialNumber; + @Schema(description = "发货物料名称") + private String sendMaterialName; + //税率 + @Schema(description = "税率") + private BigDecimal taxRate; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java index 184edd0d..7e588e23 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java @@ -60,9 +60,12 @@ public class EntrustOrderDetailRespVO { @ExcelProperty("物料编码") private String materialNumber; - @Schema(description = "计量单位") - @ExcelProperty("计量单位") - private String uom; + @Schema(description = "发货计量单位") + @ExcelProperty("发货计量单位") + private String sendUnit; + @Schema(description = "收货计量单位") + @ExcelProperty("收货计量单位") + private String receiveUnit; @Schema(description = "暂估数量") @ExcelProperty("暂估数量") @@ -122,5 +125,20 @@ public class EntrustOrderDetailRespVO { @Schema(description = "备注") @ExcelProperty("备注") private String remark; + @Schema(description = "收货物料编码") + @ExcelProperty("收货物料编码") + private String receiveMaterialNumber; + @Schema(description = "收货物料名称") + @ExcelProperty("收货物料名称") + private String receiveMaterialName; + @Schema(description = "发货物料编码") + @ExcelProperty("发货物料编码") + private String sendMaterialNumber; + @Schema(description = "发货物料名称") + @ExcelProperty("发货物料名称") + private String sendMaterialName; + @Schema(description = "税率") + @ExcelProperty("税率") + private BigDecimal taxRate; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java index c0b70665..53728635 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java @@ -46,8 +46,10 @@ public class EntrustOrderDetailSaveReqVO { @Schema(description = "物料编码") private String materialNumber; - @Schema(description = "计量单位") - private String uom; + @Schema(description = "发货计量单位") + private String sendUnit; + @Schema(description = "收货计量单位") + private String receiveUnit; @Schema(description = "暂估数量") private BigDecimal forecastQuantity; @@ -89,5 +91,14 @@ public class EntrustOrderDetailSaveReqVO { private String accountingItemAllocation; @Schema(description = "备注") private String remark; - + @Schema(description = "收货物料编码") + private String receiveMaterialNumber; + @Schema(description = "收货物料名称") + private String receiveMaterialName; + @Schema(description = "发货物料编码") + private String sendMaterialNumber; + @Schema(description = "发货物料名称") + private String sendMaterialName; + @Schema(description = "税率") + private BigDecimal taxRate; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java index d02ae8bc..72f03e44 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.dal.dataobject.entrustorder; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -81,20 +82,35 @@ public class EntrustOrderDetailDO extends BusinessBaseDO { @TableField("RCV_WRH_NUM") private String receiveWarehouseNumber; /** - * 物料名称 + * 发货物料名称 */ - @TableField("MTRL_NAME") - private String materialName; + @TableField("SND_MTRL_NAME") + private String sendMaterialName; /** - * 物料编码 + * 发货物料编码 */ - @TableField("MTRL_NUM") - private String materialNumber; + @TableField("SND_MTRL_NUM") + private String sendMaterialNumber; /** - * 计量单位 + * 收货物料名称 */ - @TableField("UOM") - private String uom; + @TableField("RCV_MTRL_NAME") + private String receiveMaterialName; + /** + * 收货物料编码 + */ + @TableField("RCV_MTRL_NUM") + private String receiveMaterialNumber; + /** + * 发货计量单位 + */ + @TableField("SND_UOM") + private String sendUnit; + /** + * 收货计量单位 + */ + @TableField("RCV_UOM") + private String receiveUnit; /** * 暂估数量 */ @@ -151,4 +167,7 @@ public class EntrustOrderDetailDO extends BusinessBaseDO { private String accountingItemAllocation; @TableField("RMK") private String remark; + + @TableField("TAX_RTE") + private BigDecimal taxRate; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java index dea70798..630ff0d8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java @@ -26,9 +26,10 @@ public interface EntrustOrderDetailMapper extends BaseMapperX