朱园亮 / xingyun-erp · Commits

Commit 7aa8289793d5c7048b8820905eae738e1a72490c

Authored by 房远帅
1 parent c81ba30a

楚江ERP：订货单新增执行标准备注

Inline Side-by-side
Showing 6 changed files with 30 additions and 0 deletions
@@ -92,6 +92,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> { @@ -92,6 +92,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
92 private String executionStandard; 92 private String executionStandard;
93 93
94 /** 94 /**
  95 + * 执行标准备注
  96 + */
  97 + @ApiModelProperty("执行标准备注")
  98 + private String executionStandardRemarks;
  99 +
  100 + /**
95 * 开票情况 101 * 开票情况
96 */ 102 */
97 @ApiModelProperty("开票情况") 103 @ApiModelProperty("开票情况")
@@ -84,6 +84,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto { @@ -84,6 +84,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
84 private String executionStandard; 84 private String executionStandard;
85 85
86 /** 86 /**
  87 + * 执行标准备注
  88 + */
  89 + private String executionStandardRemarks;
  90 +
  91 + /**
87 * 开票情况 92 * 开票情况
88 */ 93 */
89 private String invoicingStatus; 94 private String invoicingStatus;
@@ -177,6 +177,9 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -177,6 +177,9 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
177 if (!StringUtil.isBlank(vo.getExecutionStandard())) { 177 if (!StringUtil.isBlank(vo.getExecutionStandard())) {
178 data.setExecutionStandard(vo.getExecutionStandard()); 178 data.setExecutionStandard(vo.getExecutionStandard());
179 } 179 }
  180 + if (!StringUtil.isBlank(vo.getExecutionStandardRemarks())) {
  181 + data.setExecutionStandardRemarks(vo.getExecutionStandardRemarks());
  182 + }
180 if (!StringUtil.isBlank(vo.getInvoicingStatus())) { 183 if (!StringUtil.isBlank(vo.getInvoicingStatus())) {
181 data.setInvoicingStatus(vo.getInvoicingStatus()); 184 data.setInvoicingStatus(vo.getInvoicingStatus());
182 } 185 }
@@ -272,6 +275,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -272,6 +275,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
272 .set(PurchaseOrderInfo::getDeliveryMethod, StringUtil.isBlank(vo.getDeliveryMethod()) ? null : vo.getDeliveryMethod()) 275 .set(PurchaseOrderInfo::getDeliveryMethod, StringUtil.isBlank(vo.getDeliveryMethod()) ? null : vo.getDeliveryMethod())
273 .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo()) 276 .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo())
274 .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(vo.getExecutionStandard()) ? null : vo.getExecutionStandard()) 277 .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(vo.getExecutionStandard()) ? null : vo.getExecutionStandard())
  278 + .set(PurchaseOrderInfo::getExecutionStandardRemarks, StringUtil.isBlank(vo.getExecutionStandardRemarks()) ? null : vo.getExecutionStandardRemarks())
275 .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus()) 279 .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus())
276 .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost()) 280 .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
277 .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader()) 281 .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader())
@@ -328,6 +332,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -328,6 +332,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
328 LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class) 332 LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
329 .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo()) 333 .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo())
330 .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(vo.getExecutionStandard()) ? null : vo.getExecutionStandard()) 334 .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(vo.getExecutionStandard()) ? null : vo.getExecutionStandard())
  335 + .set(PurchaseOrderInfo::getExecutionStandardRemarks, StringUtil.isBlank(vo.getExecutionStandardRemarks()) ? null : vo.getExecutionStandardRemarks())
331 .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus()) 336 .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus())
332 .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost()) 337 .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
333 .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader()) 338 .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader())
@@ -85,6 +85,12 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable { @@ -85,6 +85,12 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
85 private String executionStandard; 85 private String executionStandard;
86 86
87 /** 87 /**
  88 + * 执行标准备注
  89 + */
  90 + @ApiModelProperty("执行标准备注")
  91 + private String executionStandardRemarks;
  92 +
  93 + /**
88 * 开票情况 94 * 开票情况
89 */ 95 */
90 @ApiModelProperty("开票情况") 96 @ApiModelProperty("开票情况")
@@ -86,6 +86,12 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable { @@ -86,6 +86,12 @@ public class UpdatePurchaseOrderInfoVo implements BaseVo, Serializable {
86 private String executionStandard; 86 private String executionStandard;
87 87
88 /** 88 /**
  89 + * 执行标准备注
  90 + */
  91 + @ApiModelProperty("执行标准备注")
  92 + private String executionStandardRemarks;
  93 +
  94 + /**
89 * 开票情况 95 * 开票情况
90 */ 96 */
91 @ApiModelProperty("开票情况") 97 @ApiModelProperty("开票情况")
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 <result column="delivery_method" property="deliveryMethod"/> 14 <result column="delivery_method" property="deliveryMethod"/>
15 <result column="price_list_no" property="priceListNo"/> 15 <result column="price_list_no" property="priceListNo"/>
16 <result column="execution_standard" property="executionStandard"/> 16 <result column="execution_standard" property="executionStandard"/>
  17 + <result column="execution_standard_remarks" property="executionStandardRemarks"/>
17 <result column="invoicing_status" property="invoicingStatus"/> 18 <result column="invoicing_status" property="invoicingStatus"/>
18 <result column="shipping_cost" property="shippingCost"/> 19 <result column="shipping_cost" property="shippingCost"/>
19 <result column="piece_weight_header" property="pieceWeightHeader"/> 20 <result column="piece_weight_header" property="pieceWeightHeader"/>
@@ -59,6 +60,7 @@ @@ -59,6 +60,7 @@
59 tb.delivery_method, 60 tb.delivery_method,
60 tb.price_list_no, 61 tb.price_list_no,
61 tb.execution_standard, 62 tb.execution_standard,
  63 + tb.execution_standard_remarks,
62 tb.invoicing_status, 64 tb.invoicing_status,
63 tb.shipping_cost, 65 tb.shipping_cost,
64 tb.piece_weight_header, 66 tb.piece_weight_header,