Showing
6 changed files
with
18 additions
and
0 deletions
| @@ -2931,6 +2931,7 @@ CREATE TABLE IF NOT EXISTS `procurement_buyout_account_order` | @@ -2931,6 +2931,7 @@ CREATE TABLE IF NOT EXISTS `procurement_buyout_account_order` | ||
| 2931 | `total_instock_quantity` decimal(12,2) DEFAULT NULL COMMENT '合计-入库数量 kg(前端计算传入)', | 2931 | `total_instock_quantity` decimal(12,2) DEFAULT NULL COMMENT '合计-入库数量 kg(前端计算传入)', |
| 2932 | `total_instock_amount` decimal(14,2) DEFAULT NULL COMMENT '合计-入库金额(前端计算传入)', | 2932 | `total_instock_amount` decimal(14,2) DEFAULT NULL COMMENT '合计-入库金额(前端计算传入)', |
| 2933 | `total_diff_amount` decimal(14,2) DEFAULT NULL COMMENT '合计-差异金额 元(前端计算传入)', | 2933 | `total_diff_amount` decimal(14,2) DEFAULT NULL COMMENT '合计-差异金额 元(前端计算传入)', |
| 2934 | + `weigh_diff` decimal(12,2) DEFAULT NULL COMMENT '磅差情况(数值,可修改)', | ||
| 2934 | `flow_node` varchar(50) DEFAULT NULL COMMENT '流程节点', | 2935 | `flow_node` varchar(50) DEFAULT NULL COMMENT '流程节点', |
| 2935 | `approval_status` varchar(50) DEFAULT NULL COMMENT '审核状态 DRAFT-草稿 AUDIT-审核中 PASS-审核通过 REFUSE-已驳回 CANCEL-已取消', | 2936 | `approval_status` varchar(50) DEFAULT NULL COMMENT '审核状态 DRAFT-草稿 AUDIT-审核中 PASS-审核通过 REFUSE-已驳回 CANCEL-已取消', |
| 2936 | `fccktjy_id` varchar(32) DEFAULT NULL COMMENT '分厂仓库统计员审核人ID(审核通过时记录)', | 2937 | `fccktjy_id` varchar(32) DEFAULT NULL COMMENT '分厂仓库统计员审核人ID(审核通过时记录)', |
| @@ -70,6 +70,9 @@ public class GetBuyoutAccountOrderBo { | @@ -70,6 +70,9 @@ public class GetBuyoutAccountOrderBo { | ||
| 70 | @ApiModelProperty("合计-差异金额 元") | 70 | @ApiModelProperty("合计-差异金额 元") |
| 71 | private BigDecimal totalDiffAmount; | 71 | private BigDecimal totalDiffAmount; |
| 72 | 72 | ||
| 73 | + @ApiModelProperty("磅差情况(数值,可修改)") | ||
| 74 | + private BigDecimal weighDiff; | ||
| 75 | + | ||
| 73 | @ApiModelProperty("流程节点 FCCKTJY/FCCKZG/FCZLFG/GYGLKZG/FCYLKJ/FCCWKZG/GYBZG") | 76 | @ApiModelProperty("流程节点 FCCKTJY/FCCKZG/FCZLFG/GYGLKZG/FCYLKJ/FCCWKZG/GYBZG") |
| 74 | private String flowNode; | 77 | private String flowNode; |
| 75 | 78 |
| @@ -111,6 +111,11 @@ public class ProcurementBuyoutAccountOrder extends BaseEntity implements BaseDto | @@ -111,6 +111,11 @@ public class ProcurementBuyoutAccountOrder extends BaseEntity implements BaseDto | ||
| 111 | private BigDecimal totalDiffAmount; | 111 | private BigDecimal totalDiffAmount; |
| 112 | 112 | ||
| 113 | /** | 113 | /** |
| 114 | + * 磅差情况(数值,可修改) | ||
| 115 | + */ | ||
| 116 | + private BigDecimal weighDiff; | ||
| 117 | + | ||
| 118 | + /** | ||
| 114 | * 流程节点 FCCKTJY-分厂仓库统计员 FCCKZG-分厂仓库主管 FCZLFG-分厂质量分管 GYGLKZG-供应管理科主管 FCYLKJ-分厂原料会计 FCCWKZG-分厂财务科主管 GYBZG-供应部主管 | 119 | * 流程节点 FCCKTJY-分厂仓库统计员 FCCKZG-分厂仓库主管 FCZLFG-分厂质量分管 GYGLKZG-供应管理科主管 FCYLKJ-分厂原料会计 FCCWKZG-分厂财务科主管 GYBZG-供应部主管 |
| 115 | */ | 120 | */ |
| 116 | private String flowNode; | 121 | private String flowNode; |
| @@ -321,6 +321,8 @@ public class ProcurementBuyoutAccountOrderServiceImpl | @@ -321,6 +321,8 @@ public class ProcurementBuyoutAccountOrderServiceImpl | ||
| 321 | entity.setTotalInstockQuantity(vo.getTotalInstockQuantity()); | 321 | entity.setTotalInstockQuantity(vo.getTotalInstockQuantity()); |
| 322 | entity.setTotalInstockAmount(vo.getTotalInstockAmount()); | 322 | entity.setTotalInstockAmount(vo.getTotalInstockAmount()); |
| 323 | entity.setTotalDiffAmount(vo.getTotalDiffAmount()); | 323 | entity.setTotalDiffAmount(vo.getTotalDiffAmount()); |
| 324 | + // 磅差情况由前端传入,后端保存 | ||
| 325 | + entity.setWeighDiff(vo.getWeighDiff()); | ||
| 324 | entity.setApprovalStatus(STATUS_DRAFT); | 326 | entity.setApprovalStatus(STATUS_DRAFT); |
| 325 | // 制单阶段当前节点为分厂仓库统计员 | 327 | // 制单阶段当前节点为分厂仓库统计员 |
| 326 | entity.setFlowNode(NODE_FCCKTJY); | 328 | entity.setFlowNode(NODE_FCCKTJY); |
| @@ -356,6 +358,8 @@ public class ProcurementBuyoutAccountOrderServiceImpl | @@ -356,6 +358,8 @@ public class ProcurementBuyoutAccountOrderServiceImpl | ||
| 356 | entity.setTotalInstockQuantity(vo.getTotalInstockQuantity()); | 358 | entity.setTotalInstockQuantity(vo.getTotalInstockQuantity()); |
| 357 | entity.setTotalInstockAmount(vo.getTotalInstockAmount()); | 359 | entity.setTotalInstockAmount(vo.getTotalInstockAmount()); |
| 358 | entity.setTotalDiffAmount(vo.getTotalDiffAmount()); | 360 | entity.setTotalDiffAmount(vo.getTotalDiffAmount()); |
| 361 | + // 磅差情况由前端传入,后端保存 | ||
| 362 | + entity.setWeighDiff(vo.getWeighDiff()); | ||
| 359 | 363 | ||
| 360 | this.updateById(entity); | 364 | this.updateById(entity); |
| 361 | 365 |
| @@ -34,6 +34,9 @@ public class CreateBuyoutAccountOrderVo implements Serializable { | @@ -34,6 +34,9 @@ public class CreateBuyoutAccountOrderVo implements Serializable { | ||
| 34 | @ApiModelProperty("合计-差异金额 元(前端计算传入)") | 34 | @ApiModelProperty("合计-差异金额 元(前端计算传入)") |
| 35 | private BigDecimal totalDiffAmount; | 35 | private BigDecimal totalDiffAmount; |
| 36 | 36 | ||
| 37 | + @ApiModelProperty("磅差情况(数值,可修改)") | ||
| 38 | + private BigDecimal weighDiff; | ||
| 39 | + | ||
| 37 | @NotEmpty(message = "明细不能为空!") | 40 | @NotEmpty(message = "明细不能为空!") |
| 38 | @Valid | 41 | @Valid |
| 39 | @ApiModelProperty("明细数据") | 42 | @ApiModelProperty("明细数据") |
| @@ -25,6 +25,7 @@ | @@ -25,6 +25,7 @@ | ||
| 25 | <result column="total_instock_quantity" property="totalInstockQuantity"/> | 25 | <result column="total_instock_quantity" property="totalInstockQuantity"/> |
| 26 | <result column="total_instock_amount" property="totalInstockAmount"/> | 26 | <result column="total_instock_amount" property="totalInstockAmount"/> |
| 27 | <result column="total_diff_amount" property="totalDiffAmount"/> | 27 | <result column="total_diff_amount" property="totalDiffAmount"/> |
| 28 | + <result column="weigh_diff" property="weighDiff"/> | ||
| 28 | <result column="flow_node" property="flowNode"/> | 29 | <result column="flow_node" property="flowNode"/> |
| 29 | <result column="approval_status" property="approvalStatus"/> | 30 | <result column="approval_status" property="approvalStatus"/> |
| 30 | <result column="fccktjy_id" property="fccktjyId"/> | 31 | <result column="fccktjy_id" property="fccktjyId"/> |
| @@ -71,6 +72,7 @@ | @@ -71,6 +72,7 @@ | ||
| 71 | tb.total_instock_quantity, | 72 | tb.total_instock_quantity, |
| 72 | tb.total_instock_amount, | 73 | tb.total_instock_amount, |
| 73 | tb.total_diff_amount, | 74 | tb.total_diff_amount, |
| 75 | + tb.weigh_diff, | ||
| 74 | tb.flow_node, | 76 | tb.flow_node, |
| 75 | tb.approval_status, | 77 | tb.approval_status, |
| 76 | tb.fccktjy_id, | 78 | tb.fccktjy_id, |