朱园亮 / xingyun-erp · Commits

Commit a1432b753936f806df68afb5f071610a0728b073

Authored by 杨鸣坤
1 parent 339b73ab

楚江ERP：补货单增加厚度、长、宽的误差值

Inline Side-by-side
Showing 8 changed files with 177 additions and 17 deletions
... ... @@ -280,9 +280,15 @@ create table `tbl_replenishment_order_line`
280 280 `replenishment_order_id` varchar(32) NOT NULL COMMENT '补货单',
281 281 `purchase_order_line_id` varchar(32) NOT NULL COMMENT '订货单表物料行ID',
282 282 `brand` varchar(100) COMMENT '牌号',
283   - `thickness` decimal(10, 4) COMMENT '厚度',
284   - `width` decimal(10, 4) COMMENT '宽度',
285   - `length` decimal(10, 4) COMMENT '长度',
  283 + `thickness` DECIMAL(10, 4) COMMENT '厚度',
  284 + `thickness_tol_pos` DECIMAL(10, 4) COMMENT '厚度公差正',
  285 + `thickness_tol_neg` DECIMAL(10, 4) COMMENT '厚度公差负',
  286 + `width` DECIMAL(10, 4) COMMENT '宽度',
  287 + `width_tol_pos` DECIMAL(10, 4) COMMENT '宽度公差正',
  288 + `width_tol_neg` DECIMAL(10, 4) COMMENT '宽度公差负',
  289 + `length` DECIMAL(10, 4) COMMENT '长度',
  290 + `length_tol_pos` DECIMAL(10, 4) COMMENT '长度公差正',
  291 + `length_tol_neg` DECIMAL(10, 4) COMMENT '长度公差负',
286 292 `status` varchar(50) COMMENT '状态',
287 293 `quantity` decimal(15, 4) COMMENT '需发(t)',
288 294 `shipped_quantity` decimal(15, 4) COMMENT '实发(t)',
... ...
... ... @@ -49,18 +49,54 @@ public class GetReplenishmentOrderLineBo extends BaseBo<ReplenishmentOrderLine>
49 49 private BigDecimal thickness;
50 50
51 51 /**
  52 + * 厚度公差正
  53 + */
  54 + @ApiModelProperty("厚度公差正")
  55 + private BigDecimal thicknessTolPos;
  56 +
  57 + /**
  58 + * 厚度公差负
  59 + */
  60 + @ApiModelProperty("厚度公差负")
  61 + private BigDecimal thicknessTolNeg;
  62 +
  63 + /**
52 64 * 宽度
53 65 */
54 66 @ApiModelProperty("宽度")
55 67 private BigDecimal width;
56 68
57 69 /**
  70 + * 宽度公差正
  71 + */
  72 + @ApiModelProperty("宽度公差正")
  73 + private BigDecimal widthTolPos;
  74 +
  75 + /**
  76 + * 宽度公差负
  77 + */
  78 + @ApiModelProperty("宽度公差负")
  79 + private BigDecimal widthTolNeg;
  80 +
  81 + /**
58 82 * 长度
59 83 */
60 84 @ApiModelProperty("长度")
61 85 private BigDecimal length;
62 86
63 87 /**
  88 + * 长度公差正
  89 + */
  90 + @ApiModelProperty("长度公差正")
  91 + private BigDecimal lengthTolPos;
  92 +
  93 + /**
  94 + * 长度公差负
  95 + */
  96 + @ApiModelProperty("长度公差负")
  97 + private BigDecimal lengthTolNeg;
  98 +
  99 + /**
64 100 * 状态
65 101 */
66 102 @ApiModelProperty("状态")
... ...
... ... @@ -50,16 +50,46 @@ public class ReplenishmentOrderLine extends BaseEntity implements BaseDto {
50 50 private BigDecimal thickness;
51 51
52 52 /**
  53 + * 厚度公差正
  54 + */
  55 + private BigDecimal thicknessTolPos;
  56 +
  57 + /**
  58 + * 厚度公差负
  59 + */
  60 + private BigDecimal thicknessTolNeg;
  61 +
  62 + /**
53 63 * 宽度
54 64 */
55 65 private BigDecimal width;
56 66
57 67 /**
  68 + * 宽度公差正
  69 + */
  70 + private BigDecimal widthTolPos;
  71 +
  72 + /**
  73 + * 宽度公差负
  74 + */
  75 + private BigDecimal widthTolNeg;
  76 +
  77 + /**
58 78 * 长度
59 79 */
60 80 private BigDecimal length;
61 81
62 82 /**
  83 + * 长度公差正
  84 + */
  85 + private BigDecimal lengthTolPos;
  86 +
  87 + /**
  88 + * 长度公差负
  89 + */
  90 + private BigDecimal lengthTolNeg;
  91 +
  92 + /**
63 93 * 状态
64 94 */
65 95 private String status;
... ...
... ... @@ -67,8 +67,14 @@ public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<Repleni
67 67 data.setPurchaseOrderLineId(vo.getPurchaseOrderLineId());
68 68 data.setBrand(vo.getBrand());
69 69 data.setThickness(vo.getThickness());
  70 + data.setThicknessTolPos(vo.getThicknessTolPos());
  71 + data.setThicknessTolNeg(vo.getThicknessTolNeg());
70 72 data.setWidth(vo.getWidth());
  73 + data.setWidthTolPos(vo.getWidthTolPos());
  74 + data.setWidthTolNeg(vo.getWidthTolNeg());
71 75 data.setLength(vo.getLength());
  76 + data.setLengthTolPos(vo.getLengthTolPos());
  77 + data.setLengthTolNeg(vo.getLengthTolNeg());
72 78 data.setStatus(vo.getStatus());
73 79 data.setQuantity(vo.getQuantity());
74 80 data.setShippedQuantity(vo.getShippedQuantity());
... ... @@ -101,8 +107,14 @@ public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<Repleni
101 107 .set(ReplenishmentOrderLine::getPurchaseOrderLineId, vo.getPurchaseOrderLineId())
102 108 .set(ReplenishmentOrderLine::getBrand, vo.getBrand())
103 109 .set(ReplenishmentOrderLine::getThickness, vo.getThickness())
  110 + .set(ReplenishmentOrderLine::getThicknessTolPos, vo.getThicknessTolPos())
  111 + .set(ReplenishmentOrderLine::getThicknessTolNeg, vo.getThicknessTolNeg())
104 112 .set(ReplenishmentOrderLine::getWidth, vo.getWidth())
  113 + .set(ReplenishmentOrderLine::getWidthTolPos, vo.getWidthTolPos())
  114 + .set(ReplenishmentOrderLine::getWidthTolNeg, vo.getWidthTolNeg())
105 115 .set(ReplenishmentOrderLine::getLength, vo.getLength())
  116 + .set(ReplenishmentOrderLine::getLengthTolPos, vo.getLengthTolPos())
  117 + .set(ReplenishmentOrderLine::getLengthTolNeg, vo.getLengthTolNeg())
106 118 .set(ReplenishmentOrderLine::getStatus, vo.getStatus())
107 119 .set(ReplenishmentOrderLine::getQuantity, vo.getQuantity())
108 120 .set(ReplenishmentOrderLine::getShippedQuantity, vo.getShippedQuantity())
... ...
... ... @@ -170,8 +170,14 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
170 170 createReplenishmentOrderLineVo.setPurchaseOrderLineId(updateReplenishmentOrderLineVo.getPurchaseOrderLineId());
171 171 createReplenishmentOrderLineVo.setBrand(updateReplenishmentOrderLineVo.getBrand());
172 172 createReplenishmentOrderLineVo.setThickness(updateReplenishmentOrderLineVo.getThickness());
  173 + createReplenishmentOrderLineVo.setThicknessTolPos(updateReplenishmentOrderLineVo.getThicknessTolPos());
  174 + createReplenishmentOrderLineVo.setThicknessTolNeg(updateReplenishmentOrderLineVo.getThicknessTolNeg());
173 175 createReplenishmentOrderLineVo.setWidth(updateReplenishmentOrderLineVo.getWidth());
  176 + createReplenishmentOrderLineVo.setWidthTolPos(updateReplenishmentOrderLineVo.getWidthTolPos());
  177 + createReplenishmentOrderLineVo.setWidthTolNeg(updateReplenishmentOrderLineVo.getWidthTolNeg());
174 178 createReplenishmentOrderLineVo.setLength(updateReplenishmentOrderLineVo.getLength());
  179 + createReplenishmentOrderLineVo.setLengthTolPos(updateReplenishmentOrderLineVo.getLengthTolPos());
  180 + createReplenishmentOrderLineVo.setLengthTolNeg(updateReplenishmentOrderLineVo.getLengthTolNeg());
175 181 createReplenishmentOrderLineVo.setStatus(updateReplenishmentOrderLineVo.getStatus());
176 182 createReplenishmentOrderLineVo.setQuantity(updateReplenishmentOrderLineVo.getQuantity());
177 183 createReplenishmentOrderLineVo.setShippedQuantity(updateReplenishmentOrderLineVo.getShippedQuantity());
... ...
1 1 package com.lframework.xingyun.sc.vo.purchase;
2 2
3   -import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
4 3 import com.lframework.starter.web.core.components.validation.TypeMismatch;
5 4 import com.lframework.starter.web.core.vo.BaseVo;
6 5 import io.swagger.annotations.ApiModelProperty;
7 6 import lombok.Data;
8   -import org.hibernate.validator.constraints.Length;
9 7
10 8
11 9 import java.io.Serializable;
... ... @@ -21,21 +19,18 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
21 19 * 补货单
22 20 */
23 21 @ApiModelProperty(value = "补货单")
24   - @Length(message = "补货单最多允许32个字符！")
25 22 private String replenishmentOrderId;
26 23
27 24 /**
28 25 * 订货单表物料行ID
29 26 */
30 27 @ApiModelProperty(value = "订货单表物料行ID")
31   - @Length(message = "订货单表物料行ID最多允许32个字符！")
32 28 private String purchaseOrderLineId;
33 29
34 30 /**
35 31 * 牌号
36 32 */
37 33 @ApiModelProperty(value = "牌号")
38   - @Length(message = "牌号最多允许100个字符！")
39 34 private String brand;
40 35
41 36 /**
... ... @@ -43,30 +38,62 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
43 38 */
44 39 @ApiModelProperty(value = "厚度")
45 40 @TypeMismatch(message = "厚度格式有误！")
46   - @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
47 41 private BigDecimal thickness;
48 42
49 43 /**
  44 + * 厚度公差正
  45 + */
  46 + @ApiModelProperty("厚度公差正")
  47 + private BigDecimal thicknessTolPos;
  48 +
  49 + /**
  50 + * 厚度公差负
  51 + */
  52 + @ApiModelProperty("厚度公差负")
  53 + private BigDecimal thicknessTolNeg;
  54 +
  55 + /**
50 56 * 宽度
51 57 */
52 58 @ApiModelProperty(value = "宽度")
53 59 @TypeMismatch(message = "宽度格式有误！")
54   - @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
55 60 private BigDecimal width;
56 61
57 62 /**
  63 + * 宽度公差正
  64 + */
  65 + @ApiModelProperty("宽度公差正")
  66 + private BigDecimal widthTolPos;
  67 +
  68 + /**
  69 + * 宽度公差负
  70 + */
  71 + @ApiModelProperty("宽度公差负")
  72 + private BigDecimal widthTolNeg;
  73 +
  74 + /**
58 75 * 长度
59 76 */
60 77 @ApiModelProperty(value = "长度")
61 78 @TypeMismatch(message = "长度格式有误！")
62   - @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
63 79 private BigDecimal length;
64 80
65 81 /**
  82 + * 长度公差正
  83 + */
  84 + @ApiModelProperty("长度公差正")
  85 + private BigDecimal lengthTolPos;
  86 +
  87 + /**
  88 + * 长度公差负
  89 + */
  90 + @ApiModelProperty("长度公差负")
  91 + private BigDecimal lengthTolNeg;
  92 +
  93 + /**
66 94 * 状态
67 95 */
68 96 @ApiModelProperty(value = "状态")
69   - @Length(message = "状态最多允许50个字符！")
70 97 private String status;
71 98
72 99 /**
... ... @@ -74,7 +101,6 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
74 101 */
75 102 @ApiModelProperty(value = "需发(t)")
76 103 @TypeMismatch(message = "需发(t)格式有误！")
77   - @IsNumberPrecision(message = "需发(t)最多允许4位小数！", value = 4)
78 104 private BigDecimal quantity;
79 105
80 106 /**
... ... @@ -82,7 +108,6 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
82 108 */
83 109 @ApiModelProperty(value = "实发(t)")
84 110 @TypeMismatch(message = "实发(t)格式有误！")
85   - @IsNumberPrecision(message = "实发(t)最多允许4位小数！", value = 4)
86 111 private BigDecimal shippedQuantity;
87 112
88 113 /**
... ... @@ -90,7 +115,6 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
90 115 */
91 116 @ApiModelProperty(value = "需求补发(t/件)")
92 117 @TypeMismatch(message = "需求补发(t/件)格式有误！")
93   - @IsNumberPrecision(message = "需求补发(t/件)最多允许4位小数！", value = 4)
94 118 private BigDecimal supplementaryQuantity;
95 119
96 120 /**
... ... @@ -104,14 +128,12 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
104 128 * 备注
105 129 */
106 130 @ApiModelProperty(value = "备注")
107   - @Length(message = "备注最多允许65,535个字符！")
108 131 private String remarks;
109 132
110 133 /**
111 134 * 排序
112 135 */
113 136 @ApiModelProperty(value = "排序")
114   - @TypeMismatch(message = "排序格式有误！")
115 137 private Integer showOrder;
116 138
117 139 /**
... ...
... ... @@ -44,18 +44,54 @@ public class UpdateReplenishmentOrderLineVo implements BaseVo, Serializable {
44 44 private BigDecimal thickness;
45 45
46 46 /**
  47 + * 厚度公差正
  48 + */
  49 + @ApiModelProperty("厚度公差正")
  50 + private BigDecimal thicknessTolPos;
  51 +
  52 + /**
  53 + * 厚度公差负
  54 + */
  55 + @ApiModelProperty("厚度公差负")
  56 + private BigDecimal thicknessTolNeg;
  57 +
  58 + /**
47 59 * 宽度
48 60 */
49 61 @ApiModelProperty(value = "宽度")
50 62 private BigDecimal width;
51 63
52 64 /**
  65 + * 宽度公差正
  66 + */
  67 + @ApiModelProperty("宽度公差正")
  68 + private BigDecimal widthTolPos;
  69 +
  70 + /**
  71 + * 宽度公差负
  72 + */
  73 + @ApiModelProperty("宽度公差负")
  74 + private BigDecimal widthTolNeg;
  75 +
  76 + /**
53 77 * 长度
54 78 */
55 79 @ApiModelProperty(value = "长度")
56 80 private BigDecimal length;
57 81
58 82 /**
  83 + * 长度公差正
  84 + */
  85 + @ApiModelProperty("长度公差正")
  86 + private BigDecimal lengthTolPos;
  87 +
  88 + /**
  89 + * 长度公差负
  90 + */
  91 + @ApiModelProperty("长度公差负")
  92 + private BigDecimal lengthTolNeg;
  93 +
  94 + /**
59 95 * 状态
60 96 */
61 97 @ApiModelProperty(value = "状态")
... ...
... ... @@ -8,8 +8,14 @@
8 8 <result column="purchase_order_line_id" property="purchaseOrderLineId"/>
9 9 <result column="brand" property="brand"/>
10 10 <result column="thickness" property="thickness"/>
  11 + <result column="thickness_tol_pos" property="thicknessTolPos"/>
  12 + <result column="thickness_tol_neg" property="thicknessTolNeg"/>
11 13 <result column="width" property="width"/>
  14 + <result column="width_tol_pos" property="widthTolPos"/>
  15 + <result column="width_tol_neg" property="widthTolNeg"/>
12 16 <result column="length" property="length"/>
  17 + <result column="length_tol_pos" property="lengthTolPos"/>
  18 + <result column="length_tol_neg" property="lengthTolNeg"/>
13 19 <result column="status" property="status"/>
14 20 <result column="quantity" property="quantity"/>
15 21 <result column="shipped_quantity" property="shippedQuantity"/>
... ... @@ -31,8 +37,14 @@
31 37 tb.purchase_order_line_id,
32 38 tb.brand,
33 39 tb.thickness,
  40 + tb.thickness_tol_pos,
  41 + tb.thickness_tol_neg,
34 42 tb.width,
  43 + tb.width_tol_pos,
  44 + tb.width_tol_neg,
35 45 tb.length,
  46 + tb.length_tol_pos,
  47 + tb.length_tol_neg,
36 48 tb.status,
37 49 tb.quantity,
38 50 tb.shipped_quantity,
... ...