朱园亮 / xingyun-erp · Commits

Commit 814fb677ee3af4d03fbffda487c7081b800740a5

Authored by 房远帅
1 parent 483f4ec2

试样订单:产品试样确认单基础方法

Inline Side-by-side
Showing 7 changed files with 28 additions and 103 deletions
@@ -153,6 +153,6 @@ public class GetProductSampleConfirmationSlipDetailBo extends BaseBo<ProductSamp @@ -153,6 +153,6 @@ public class GetProductSampleConfirmationSlipDetailBo extends BaseBo<ProductSamp
153 SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("PROVIDE_SAMPLES", dto.getProvideSamples()); 153 SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("PROVIDE_SAMPLES", dto.getProvideSamples());
154 this.provideSamplesName = dataDicItem == null ? "" : dataDicItem.getName(); 154 this.provideSamplesName = dataDicItem == null ? "" : dataDicItem.getName();
155 SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("CLEAR_PARAMETERS", dto.getClearParameters()); 155 SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("CLEAR_PARAMETERS", dto.getClearParameters());
156 - this.clearParameters = dataDicItem1 == null ? "" : dataDicItem1.getName(); 156 + this.clearParametersName = dataDicItem1 == null ? "" : dataDicItem1.getName();
157 } 157 }
158 } 158 }
@@ -5,7 +5,6 @@ import java.math.BigDecimal; @@ -5,7 +5,6 @@ import java.math.BigDecimal;
5 import com.lframework.starter.common.constants.StringPool; 5 import com.lframework.starter.common.constants.StringPool;
6 import com.lframework.starter.web.core.bo.BaseBo; 6 import com.lframework.starter.web.core.bo.BaseBo;
7 import java.time.LocalDateTime; 7 import java.time.LocalDateTime;
8 -  
9 import com.lframework.starter.web.core.utils.ApplicationUtil; 8 import com.lframework.starter.web.core.utils.ApplicationUtil;
10 import com.lframework.starter.web.inner.entity.SysDataDicItem; 9 import com.lframework.starter.web.inner.entity.SysDataDicItem;
11 import com.lframework.starter.web.inner.service.system.SysDataDicItemService; 10 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
@@ -36,6 +35,13 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo @@ -36,6 +35,13 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
36 private String orderingUnit; 35 private String orderingUnit;
37 36
38 /** 37 /**
  38 + * 订货单位名称
  39 + */
  40 + @ApiModelProperty("订货单位名称")
  41 + private String orderingUnitName;
  42 +
  43 +
  44 + /**
39 * 试样种类 45 * 试样种类
40 */ 46 */
41 @ApiModelProperty("试样种类") 47 @ApiModelProperty("试样种类")
@@ -67,6 +73,12 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo @@ -67,6 +73,12 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
67 private String workshopId; 73 private String workshopId;
68 74
69 /** 75 /**
  76 + * 所属厂别
  77 + */
  78 + @ApiModelProperty("所属厂别")
  79 + private String workshopName;
  80 +
  81 + /**
70 * 所属品种 82 * 所属品种
71 */ 83 */
72 @ApiModelProperty("所属品种") 84 @ApiModelProperty("所属品种")
@@ -88,13 +100,13 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo @@ -88,13 +100,13 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
88 * 本次试样数量是否超规定 100 * 本次试样数量是否超规定
89 */ 101 */
90 @ApiModelProperty("本次试样数量是否超规定") 102 @ApiModelProperty("本次试样数量是否超规定")
91 - private Integer sampleQuantityRegulation; 103 + private boolean sampleQuantityRegulation;
92 104
93 /** 105 /**
94 * 试样规格个数是否超规定 106 * 试样规格个数是否超规定
95 */ 107 */
96 @ApiModelProperty("试样规格个数是否超规定") 108 @ApiModelProperty("试样规格个数是否超规定")
97 - private Integer specificationQuantityRegulation; 109 + private boolean specificationQuantityRegulation;
98 110
99 /** 111 /**
100 * 试样次数 112 * 试样次数
@@ -115,6 +127,12 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo @@ -115,6 +127,12 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
115 private String preparedBy; 127 private String preparedBy;
116 128
117 /** 129 /**
  130 + * 制单人
  131 + */
  132 + @ApiModelProperty("制单人")
  133 + private String preparedByName;
  134 +
  135 + /**
118 * 审核状态 136 * 审核状态
119 */ 137 */
120 @ApiModelProperty("审核状态") 138 @ApiModelProperty("审核状态")
@@ -153,6 +153,6 @@ public class QueryProductSampleConfirmationSlipDetailBo extends BaseBo<ProductSa @@ -153,6 +153,6 @@ public class QueryProductSampleConfirmationSlipDetailBo extends BaseBo<ProductSa
153 SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("PROVIDE_SAMPLES", dto.getProvideSamples()); 153 SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("PROVIDE_SAMPLES", dto.getProvideSamples());
154 this.provideSamplesName = dataDicItem == null ? "" : dataDicItem.getName(); 154 this.provideSamplesName = dataDicItem == null ? "" : dataDicItem.getName();
155 SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("CLEAR_PARAMETERS", dto.getClearParameters()); 155 SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("CLEAR_PARAMETERS", dto.getClearParameters());
156 - this.clearParameters = dataDicItem1 == null ? "" : dataDicItem1.getName(); 156 + this.clearParametersName = dataDicItem1 == null ? "" : dataDicItem1.getName();
157 } 157 }
158 } 158 }
@@ -101,7 +101,7 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll @@ -101,7 +101,7 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll
101 @ApiOperation("新增") 101 @ApiOperation("新增")
102 @HasPermission({"sample-order:confirmation-form:add"}) 102 @HasPermission({"sample-order:confirmation-form:add"})
103 @PostMapping 103 @PostMapping
104 - public InvokeResult<Void> create(@Valid CreateProductSampleConfirmationSlipVo vo) { 104 + public InvokeResult<Void> create(@Valid @RequestBody CreateProductSampleConfirmationSlipVo vo) {
105 105
106 productSampleConfirmationSlipService.create(vo); 106 productSampleConfirmationSlipService.create(vo);
107 107
@@ -114,7 +114,7 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll @@ -114,7 +114,7 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll
114 @ApiOperation("修改") 114 @ApiOperation("修改")
115 @HasPermission({"sample-order:confirmation-form:modify", "sample-order:confirmation-form:approve"}) 115 @HasPermission({"sample-order:confirmation-form:modify", "sample-order:confirmation-form:approve"})
116 @PutMapping 116 @PutMapping
117 - public InvokeResult<Void> update(@Valid UpdateProductSampleConfirmationSlipVo vo) { 117 + public InvokeResult<Void> update(@Valid @RequestBody UpdateProductSampleConfirmationSlipVo vo) {
118 118
119 productSampleConfirmationSlipService.update(vo); 119 productSampleConfirmationSlipService.update(vo);
120 120
@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.sample; @@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.sample;
3 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 3 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 import com.github.pagehelper.PageInfo; 5 import com.github.pagehelper.PageInfo;
  6 +import com.lframework.starter.web.core.components.security.SecurityUtil;
6 import com.lframework.starter.web.core.impl.BaseMpServiceImpl; 7 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
7 import com.lframework.starter.web.core.utils.PageResultUtil; 8 import com.lframework.starter.web.core.utils.PageResultUtil;
8 import com.lframework.starter.web.core.utils.OpLogUtil; 9 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -99,6 +100,8 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl< @@ -99,6 +100,8 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
99 if (ObjectUtil.isNull(data)) { 100 if (ObjectUtil.isNull(data)) {
100 throw new DefaultClientException("产品试样确认单不存在！"); 101 throw new DefaultClientException("产品试样确认单不存在！");
101 } 102 }
  103 + //制单人
  104 + vo.setPreparedBy(SecurityUtil.getCurrentUser().getId());
102 105
103 LambdaUpdateWrapper<ProductSampleConfirmationSlip> updateWrapper = Wrappers.lambdaUpdate(ProductSampleConfirmationSlip.class) 106 LambdaUpdateWrapper<ProductSampleConfirmationSlip> updateWrapper = Wrappers.lambdaUpdate(ProductSampleConfirmationSlip.class)
104 .set(ProductSampleConfirmationSlip::getSampleType, StringUtil.isBlank(vo.getSampleType()) ? null : vo.getSampleType()) 107 .set(ProductSampleConfirmationSlip::getSampleType, StringUtil.isBlank(vo.getSampleType()) ? null : vo.getSampleType())
@@ -128,52 +128,4 @@ public class CreateProductSampleConfirmationSlipDetailVo implements BaseVo, Seri @@ -128,52 +128,4 @@ public class CreateProductSampleConfirmationSlipDetailVo implements BaseVo, Seri
128 @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4) 128 @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
129 private BigDecimal quantity; 129 private BigDecimal quantity;
130 130
131 - /**  
132 - * 创建人ID  
133 - */  
134 - @ApiModelProperty(value = "创建人ID", required = true)  
135 - @NotBlank(message = "请输入创建人ID！")  
136 - @Length(message = "创建人ID最多允许32个字符！")  
137 - private String createById;  
138 -  
139 - /**  
140 - * 创建人  
141 - */  
142 - @ApiModelProperty(value = "创建人", required = true)  
143 - @NotBlank(message = "请输入创建人！")  
144 - @Length(message = "创建人最多允许20个字符！")  
145 - private String createBy;  
146 -  
147 - /**  
148 - * 更新人ID  
149 - */  
150 - @ApiModelProperty(value = "更新人ID", required = true)  
151 - @NotBlank(message = "请输入更新人ID！")  
152 - @Length(message = "更新人ID最多允许32个字符！")  
153 - private String updateById;  
154 -  
155 - /**  
156 - * 更新人  
157 - */  
158 - @ApiModelProperty(value = "更新人", required = true)  
159 - @NotBlank(message = "请输入更新人！")  
160 - @Length(message = "更新人最多允许20个字符！")  
161 - private String updateBy;  
162 -  
163 - /**  
164 - * 创建时间  
165 - */  
166 - @ApiModelProperty(value = "创建时间", required = true)  
167 - @NotNull(message = "请输入创建时间！")  
168 - @TypeMismatch(message = "创建时间格式有误！")  
169 - private LocalDateTime createTime;  
170 -  
171 - /**  
172 - * 更新时间  
173 - */  
174 - @ApiModelProperty(value = "更新时间", required = true)  
175 - @NotNull(message = "请输入更新时间！")  
176 - @TypeMismatch(message = "更新时间格式有误！")  
177 - private LocalDateTime updateTime;  
178 -  
179 } 131 }
@@ -57,52 +57,4 @@ public class CreateProductSampleConfirmationSlipVo implements BaseVo, Serializab @@ -57,52 +57,4 @@ public class CreateProductSampleConfirmationSlipVo implements BaseVo, Serializab
57 @ApiModelProperty("产品试样确认单详情") 57 @ApiModelProperty("产品试样确认单详情")
58 List<CreateProductSampleConfirmationSlipDetailVo> productSampleConfirmationSlipDetailList; 58 List<CreateProductSampleConfirmationSlipDetailVo> productSampleConfirmationSlipDetailList;
59 59
60 - /**  
61 - * 创建人ID  
62 - */  
63 - @ApiModelProperty(value = "创建人ID", required = true)  
64 - @NotBlank(message = "请输入创建人ID！")  
65 - @Length(message = "创建人ID最多允许32个字符！")  
66 - private String createById;  
67 -  
68 - /**  
69 - * 创建人  
70 - */  
71 - @ApiModelProperty(value = "创建人", required = true)  
72 - @NotBlank(message = "请输入创建人！")  
73 - @Length(message = "创建人最多允许20个字符！")  
74 - private String createBy;  
75 -  
76 - /**  
77 - * 更新人ID  
78 - */  
79 - @ApiModelProperty(value = "更新人ID", required = true)  
80 - @NotBlank(message = "请输入更新人ID！")  
81 - @Length(message = "更新人ID最多允许32个字符！")  
82 - private String updateById;  
83 -  
84 - /**  
85 - * 更新人  
86 - */  
87 - @ApiModelProperty(value = "更新人", required = true)  
88 - @NotBlank(message = "请输入更新人！")  
89 - @Length(message = "更新人最多允许20个字符！")  
90 - private String updateBy;  
91 -  
92 - /**  
93 - * 创建时间  
94 - */  
95 - @ApiModelProperty(value = "创建时间", required = true)  
96 - @NotNull(message = "请输入创建时间！")  
97 - @TypeMismatch(message = "创建时间格式有误！")  
98 - private LocalDateTime createTime;  
99 -  
100 - /**  
101 - * 更新时间  
102 - */  
103 - @ApiModelProperty(value = "更新时间", required = true)  
104 - @NotNull(message = "请输入更新时间！")  
105 - @TypeMismatch(message = "更新时间格式有误！")  
106 - private LocalDateTime updateTime;  
107 -  
108 } 60 }