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

@@ -153,6 +153,6 @@ public class GetProductSampleConfirmationSlipDetailBo extends BaseBo<ProductSamp
         SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("PROVIDE_SAMPLES", dto.getProvideSamples());
         this.provideSamplesName = dataDicItem == null ? "" : dataDicItem.getName();
         SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("CLEAR_PARAMETERS", dto.getClearParameters());
-        this.clearParameters = dataDicItem1 == null ? "" : dataDicItem1.getName();
+        this.clearParametersName = dataDicItem1 == null ? "" : dataDicItem1.getName();
     }
 }

@@ -5,7 +5,6 @@ import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDateTime;
-
 import com.lframework.starter.web.core.utils.ApplicationUtil;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
@@ -36,6 +35,13 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
     private String orderingUnit;
 
     /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+
+    /**
      * 试样种类
      */
     @ApiModelProperty("试样种类")
@@ -67,6 +73,12 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
     private String workshopId;
 
     /**
+     * 所属厂别
+     */
+    @ApiModelProperty("所属厂别")
+    private String workshopName;
+
+    /**
      * 所属品种
      */
     @ApiModelProperty("所属品种")
@@ -88,13 +100,13 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
      * 本次试样数量是否超规定
      */
     @ApiModelProperty("本次试样数量是否超规定")
-    private Integer sampleQuantityRegulation;
+    private boolean sampleQuantityRegulation;
 
     /**
      * 试样规格个数是否超规定
      */
     @ApiModelProperty("试样规格个数是否超规定")
-    private Integer specificationQuantityRegulation;
+    private boolean specificationQuantityRegulation;
 
     /**
      * 试样次数
@@ -115,6 +127,12 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
     private String preparedBy;
 
     /**
+     * 制单人
+     */
+    @ApiModelProperty("制单人")
+    private String preparedByName;
+
+    /**
      * 审核状态
      */
     @ApiModelProperty("审核状态")

@@ -153,6 +153,6 @@ public class QueryProductSampleConfirmationSlipDetailBo extends BaseBo<ProductSa
         SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("PROVIDE_SAMPLES", dto.getProvideSamples());
         this.provideSamplesName = dataDicItem == null ? "" : dataDicItem.getName();
         SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("CLEAR_PARAMETERS", dto.getClearParameters());
-        this.clearParameters = dataDicItem1 == null ? "" : dataDicItem1.getName();
+        this.clearParametersName = dataDicItem1 == null ? "" : dataDicItem1.getName();
     }
 }

@@ -101,7 +101,7 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll
     @ApiOperation("新增")
     @HasPermission({"sample-order:confirmation-form:add"})
     @PostMapping
-    public InvokeResult<Void> create(@Valid CreateProductSampleConfirmationSlipVo vo) {
+    public InvokeResult<Void> create(@Valid @RequestBody CreateProductSampleConfirmationSlipVo vo) {
 
         productSampleConfirmationSlipService.create(vo);
 
@@ -114,7 +114,7 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll
     @ApiOperation("修改")
     @HasPermission({"sample-order:confirmation-form:modify", "sample-order:confirmation-form:approve"})
     @PutMapping
-    public InvokeResult<Void> update(@Valid UpdateProductSampleConfirmationSlipVo vo) {
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateProductSampleConfirmationSlipVo vo) {
 
         productSampleConfirmationSlipService.update(vo);
 

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.sample;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
@@ -99,6 +100,8 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("产品试样确认单不存在！");
         }
+        //制单人
+        vo.setPreparedBy(SecurityUtil.getCurrentUser().getId());
 
         LambdaUpdateWrapper<ProductSampleConfirmationSlip> updateWrapper = Wrappers.lambdaUpdate(ProductSampleConfirmationSlip.class)
                 .set(ProductSampleConfirmationSlip::getSampleType, StringUtil.isBlank(vo.getSampleType()) ? null : vo.getSampleType())

@@ -128,52 +128,4 @@ public class CreateProductSampleConfirmationSlipDetailVo implements BaseVo, Seri
     @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
     private BigDecimal quantity;
 
-    /**
-     * 创建人ID
-     */
-    @ApiModelProperty(value = "创建人ID", required = true)
-    @NotBlank(message = "请输入创建人ID！")
-    @Length(message = "创建人ID最多允许32个字符！")
-    private String createById;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人", required = true)
-    @NotBlank(message = "请输入创建人！")
-    @Length(message = "创建人最多允许20个字符！")
-    private String createBy;
-
-    /**
-     * 更新人ID
-     */
-    @ApiModelProperty(value = "更新人ID", required = true)
-    @NotBlank(message = "请输入更新人ID！")
-    @Length(message = "更新人ID最多允许32个字符！")
-    private String updateById;
-
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人", required = true)
-    @NotBlank(message = "请输入更新人！")
-    @Length(message = "更新人最多允许20个字符！")
-    private String updateBy;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间", required = true)
-    @NotNull(message = "请输入创建时间！")
-    @TypeMismatch(message = "创建时间格式有误！")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间", required = true)
-    @NotNull(message = "请输入更新时间！")
-    @TypeMismatch(message = "更新时间格式有误！")
-    private LocalDateTime updateTime;
-
 }

@@ -57,52 +57,4 @@ public class CreateProductSampleConfirmationSlipVo implements BaseVo, Serializab
     @ApiModelProperty("产品试样确认单详情")
     List<CreateProductSampleConfirmationSlipDetailVo> productSampleConfirmationSlipDetailList;
 
-    /**
-     * 创建人ID
-     */
-    @ApiModelProperty(value = "创建人ID", required = true)
-    @NotBlank(message = "请输入创建人ID！")
-    @Length(message = "创建人ID最多允许32个字符！")
-    private String createById;
-
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人", required = true)
-    @NotBlank(message = "请输入创建人！")
-    @Length(message = "创建人最多允许20个字符！")
-    private String createBy;
-
-    /**
-     * 更新人ID
-     */
-    @ApiModelProperty(value = "更新人ID", required = true)
-    @NotBlank(message = "请输入更新人ID！")
-    @Length(message = "更新人ID最多允许32个字符！")
-    private String updateById;
-
-    /**
-     * 更新人
-     */
-    @ApiModelProperty(value = "更新人", required = true)
-    @NotBlank(message = "请输入更新人！")
-    @Length(message = "更新人最多允许20个字符！")
-    private String updateBy;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间", required = true)
-    @NotNull(message = "请输入创建时间！")
-    @TypeMismatch(message = "创建时间格式有误！")
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间", required = true)
-    @NotNull(message = "请输入更新时间！")
-    @TypeMismatch(message = "更新时间格式有误！")
-    private LocalDateTime updateTime;
-
 }