朱园亮 / xingyun-erp · Commits

Commit 864c91b5e5b0f0556e7b11b79feb8a1a9759fada

Authored by 房远帅
1 parent 0bd6a476

试样订单-bug修改

Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
@@ -88,12 +88,12 @@ public class ProductSampleConfirmationSlip extends BaseEntity implements BaseDto @@ -88,12 +88,12 @@ public class ProductSampleConfirmationSlip extends BaseEntity implements BaseDto
88 /** 88 /**
89 * 本次试样数量是否超规定 89 * 本次试样数量是否超规定
90 */ 90 */
91 - private boolean sampleQuantityRegulation; 91 + private Boolean sampleQuantityRegulation;
92 92
93 /** 93 /**
94 * 试样规格个数是否超规定 94 * 试样规格个数是否超规定
95 */ 95 */
96 - private boolean specificationQuantityRegulation; 96 + private Boolean specificationQuantityRegulation;
97 97
98 /** 98 /**
99 * 试样次数 99 * 试样次数
@@ -35,6 +35,7 @@ public class SampleResultTracking extends BaseEntity implements BaseDto { @@ -35,6 +35,7 @@ public class SampleResultTracking extends BaseEntity implements BaseDto {
35 /** 35 /**
36 * 办事处Code 36 * 办事处Code
37 */ 37 */
  38 + @TableField(exist = false)
38 private String deptCode; 39 private String deptCode;
39 40
40 /** 41 /**
@@ -146,8 +146,8 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl< @@ -146,8 +146,8 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
146 .set(ProductSampleConfirmationSlip::getSampleType, StringUtil.isBlank(vo.getSampleType()) ? null : vo.getSampleType()) 146 .set(ProductSampleConfirmationSlip::getSampleType, StringUtil.isBlank(vo.getSampleType()) ? null : vo.getSampleType())
147 .set(ProductSampleConfirmationSlip::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType()) 147 .set(ProductSampleConfirmationSlip::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType())
148 .set(ProductSampleConfirmationSlip::getOriginalSupplierPeer, StringUtil.isBlank(vo.getOriginalSupplierPeer()) ? null : vo.getOriginalSupplierPeer()) 148 .set(ProductSampleConfirmationSlip::getOriginalSupplierPeer, StringUtil.isBlank(vo.getOriginalSupplierPeer()) ? null : vo.getOriginalSupplierPeer())
149 - .set(ProductSampleConfirmationSlip::isSampleQuantityRegulation, vo.isSampleQuantityRegulation())  
150 - .set(ProductSampleConfirmationSlip::isSpecificationQuantityRegulation, vo.isSpecificationQuantityRegulation()) 149 + .set(ProductSampleConfirmationSlip::getSampleQuantityRegulation, vo.isSampleQuantityRegulation())
  150 + .set(ProductSampleConfirmationSlip::getSpecificationQuantityRegulation, vo.isSpecificationQuantityRegulation())
151 .set(ProductSampleConfirmationSlip::getSampleFrequency, StringUtil.isBlank(vo.getSampleFrequency()) ? null : vo.getSampleFrequency()) 151 .set(ProductSampleConfirmationSlip::getSampleFrequency, StringUtil.isBlank(vo.getSampleFrequency()) ? null : vo.getSampleFrequency())
152 .set(ProductSampleConfirmationSlip::getEarlyNonconformityDescription, StringUtil.isBlank(vo.getEarlyNonconformityDescription()) ? null : vo.getEarlyNonconformityDescription()) 152 .set(ProductSampleConfirmationSlip::getEarlyNonconformityDescription, StringUtil.isBlank(vo.getEarlyNonconformityDescription()) ? null : vo.getEarlyNonconformityDescription())
153 .set(ProductSampleConfirmationSlip::getPreparedBy, StringUtil.isBlank(vo.getPreparedBy()) ? null : vo.getPreparedBy()) 153 .set(ProductSampleConfirmationSlip::getPreparedBy, StringUtil.isBlank(vo.getPreparedBy()) ? null : vo.getPreparedBy())
@@ -194,8 +194,8 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl< @@ -194,8 +194,8 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
194 .set(ProductSampleConfirmationSlip::getSampleType, StringUtil.isBlank(vo.getSampleType()) ? null : vo.getSampleType()) 194 .set(ProductSampleConfirmationSlip::getSampleType, StringUtil.isBlank(vo.getSampleType()) ? null : vo.getSampleType())
195 .set(ProductSampleConfirmationSlip::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType()) 195 .set(ProductSampleConfirmationSlip::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType())
196 .set(ProductSampleConfirmationSlip::getOriginalSupplierPeer, StringUtil.isBlank(vo.getOriginalSupplierPeer()) ? null : vo.getOriginalSupplierPeer()) 196 .set(ProductSampleConfirmationSlip::getOriginalSupplierPeer, StringUtil.isBlank(vo.getOriginalSupplierPeer()) ? null : vo.getOriginalSupplierPeer())
197 - .set(ProductSampleConfirmationSlip::isSampleQuantityRegulation, vo.isSampleQuantityRegulation())  
198 - .set(ProductSampleConfirmationSlip::isSpecificationQuantityRegulation, vo.isSpecificationQuantityRegulation()) 197 + .set(ProductSampleConfirmationSlip::getSampleQuantityRegulation, vo.isSampleQuantityRegulation())
  198 + .set(ProductSampleConfirmationSlip::getSpecificationQuantityRegulation, vo.isSpecificationQuantityRegulation())
199 .set(ProductSampleConfirmationSlip::getSampleFrequency, StringUtil.isBlank(vo.getSampleFrequency()) ? null : vo.getSampleFrequency()) 199 .set(ProductSampleConfirmationSlip::getSampleFrequency, StringUtil.isBlank(vo.getSampleFrequency()) ? null : vo.getSampleFrequency())
200 .set(ProductSampleConfirmationSlip::getEarlyNonconformityDescription, StringUtil.isBlank(vo.getEarlyNonconformityDescription()) ? null : vo.getEarlyNonconformityDescription()) 200 .set(ProductSampleConfirmationSlip::getEarlyNonconformityDescription, StringUtil.isBlank(vo.getEarlyNonconformityDescription()) ? null : vo.getEarlyNonconformityDescription())
201 .eq(ProductSampleConfirmationSlip::getId, vo.getId()); 201 .eq(ProductSampleConfirmationSlip::getId, vo.getId());