朱园亮 / xingyun-erp · Commits

Commit a1946dd6d23c666802d978bc33f54dd6b41def4b

Authored by 房远帅
1 parent 4919c768

试样订单:跟踪单-试样结果

Inline Side-by-side
Showing 8 changed files with 61 additions and 122 deletions
@@ -1185,11 +1185,8 @@ create table if not exists sample_result_tracking( @@ -1185,11 +1185,8 @@ create table if not exists sample_result_tracking(
1185 packaging text comment '包装描述', 1185 packaging text comment '包装描述',
1186 weight text comment '件重描述', 1186 weight text comment '件重描述',
1187 other text comment '其它描述', 1187 other text comment '其它描述',
1188 - sample_success boolean DEFAULT FALSE COMMENT '试样成功',  
1189 - bulk_order boolean DEFAULT FALSE COMMENT '批量订货',  
1190 - sample_failure boolean DEFAULT FALSE COMMENT '试样不成功',  
1191 - continue_sample boolean DEFAULT FALSE COMMENT '继续试样',  
1192 - stop_sample boolean DEFAULT FALSE COMMENT '停止再试样', 1188 + sample_result varchar (50) COMMENT '试样结果',
  1189 + sample_result_sub varchar (50) COMMENT '试样结果子数据',
1193 customer_reviews_file_id varchar(100) comment '客户评价依据文件ID', 1190 customer_reviews_file_id varchar(100) comment '客户评价依据文件ID',
1194 customer_reviews_file_name varchar(200) comment '客户评价依据文件名称', 1191 customer_reviews_file_name varchar(200) comment '客户评价依据文件名称',
1195 status varchar(20) comment '审核状态', 1192 status varchar(20) comment '审核状态',
@@ -113,34 +113,16 @@ public class GetSampleResultTrackingBo extends BaseBo<SampleResultTracking> { @@ -113,34 +113,16 @@ public class GetSampleResultTrackingBo extends BaseBo<SampleResultTracking> {
113 private List<SampleFeedbackTrackingDetail> detailList; 113 private List<SampleFeedbackTrackingDetail> detailList;
114 114
115 /** 115 /**
116 - * 试样成功 116 + * 试样结果
117 */ 117 */
118 - @ApiModelProperty("试样成功")  
119 - private boolean sampleSuccess; 118 + @ApiModelProperty("试样结果")
  119 + private String sampleResult;
120 120
121 /** 121 /**
122 - * 批量订货 122 + * 试样结果子结果
123 */ 123 */
124 - @ApiModelProperty("批量订货")  
125 - private boolean bulkOrder;  
126 -  
127 - /**  
128 - * 试样不成功  
129 - */  
130 - @ApiModelProperty("试样不成功")  
131 - private boolean sampleFailure;  
132 -  
133 - /**  
134 - * 继续试样  
135 - */  
136 - @ApiModelProperty("继续试样")  
137 - private boolean continueSample;  
138 -  
139 - /**  
140 - * 停止再试样  
141 - */  
142 - @ApiModelProperty("停止再试样")  
143 - private boolean stopSample; 124 + @ApiModelProperty("试样结果子结果")
  125 + private String sampleResultSub;
144 126
145 /** 127 /**
146 * 客户评价依据文件ID 128 * 客户评价依据文件ID
@@ -119,34 +119,16 @@ public class QuerySampleResultTrackingBo extends BaseBo<SampleResultTracking> { @@ -119,34 +119,16 @@ public class QuerySampleResultTrackingBo extends BaseBo<SampleResultTracking> {
119 private List<SampleFeedbackTrackingDetail> detailList; 119 private List<SampleFeedbackTrackingDetail> detailList;
120 120
121 /** 121 /**
122 - * 试样成功 122 + * 试样结果
123 */ 123 */
124 - @ApiModelProperty("试样成功")  
125 - private boolean sampleSuccess; 124 + @ApiModelProperty("试样结果")
  125 + private String sampleResult;
126 126
127 /** 127 /**
128 - * 批量订货 128 + * 试样结果子结果
129 */ 129 */
130 - @ApiModelProperty("批量订货")  
131 - private boolean bulkOrder;  
132 -  
133 - /**  
134 - * 试样不成功  
135 - */  
136 - @ApiModelProperty("试样不成功")  
137 - private boolean sampleFailure;  
138 -  
139 - /**  
140 - * 继续试样  
141 - */  
142 - @ApiModelProperty("继续试样")  
143 - private boolean continueSample;  
144 -  
145 - /**  
146 - * 停止再试样  
147 - */  
148 - @ApiModelProperty("停止再试样")  
149 - private boolean stopSample; 130 + @ApiModelProperty("试样结果子结果")
  131 + private String sampleResultSub;
150 132
151 133
152 /** 134 /**
@@ -248,11 +248,37 @@ public class SampleResultTrackingController extends DefaultBaseController { @@ -248,11 +248,37 @@ public class SampleResultTrackingController extends DefaultBaseController {
248 dataMap.put("packaging", data.getPackaging() == null ? "" : data.getPackaging()); 248 dataMap.put("packaging", data.getPackaging() == null ? "" : data.getPackaging());
249 dataMap.put("weight", data.getWeight() == null ? "" : data.getWeight()); 249 dataMap.put("weight", data.getWeight() == null ? "" : data.getWeight());
250 dataMap.put("other", data.getOther() == null ? "" : data.getOther()); 250 dataMap.put("other", data.getOther() == null ? "" : data.getOther());
251 - dataMap.put("sampleSucces", data.isSampleSuccess() ? "☑试样成功" : "□试样成功");  
252 - dataMap.put("bulkOrder", data.isBulkOrder() ? "☑批量订货" : "□批量订货");  
253 - dataMap.put("sampleFailure", data.isSampleFailure() ? "☑试样不成功" : "□试样不成功");  
254 - dataMap.put("continueSample", data.isContinueSample() ? "☑继续试样" : "□继续试样");  
255 - dataMap.put("stopSample", data.isStopSample() ? "☑停止再试样" : "□停止再试样"); 251 + if (StringUtils.isNotEmpty(data.getSampleResult())) {
  252 + if ("SUCCESS".equals(data.getSampleResult())) {
  253 + dataMap.put("sampleSucces", "☑试样成功");
  254 + dataMap.put("sampleFailure", "□试样不成功");
  255 + } else {
  256 + dataMap.put("sampleSucces", "□试样成功");
  257 + dataMap.put("sampleFailure", "☑试样不成功");
  258 + }
  259 + } else {
  260 + dataMap.put("sampleSucces", "□试样成功");
  261 + dataMap.put("sampleFailure", "□试样不成功");
  262 + }
  263 + if (StringUtils.isNotEmpty(data.getSampleResultSub())) {
  264 + if (data.getSampleResultSub().equals("SUCCESS_BULK_ORDER")) {
  265 + dataMap.put("bulkOrder", "☑批量订货");
  266 + dataMap.put("continueSample", "□继续试样");
  267 + dataMap.put("stopSample", "□停止再试样");
  268 + } else if (data.getSampleResultSub().equals("FAILURE_CONTINUE")) {
  269 + dataMap.put("bulkOrder", "□批量订货");
  270 + dataMap.put("continueSample", "☑继续试样");
  271 + dataMap.put("stopSample", "□停止再试样");
  272 + } else {
  273 + dataMap.put("bulkOrder", "□批量订货");
  274 + dataMap.put("continueSample", "□继续试样");
  275 + dataMap.put("stopSample", "☑停止再试样");
  276 + }
  277 + } else {
  278 + dataMap.put("bulkOrder", "□批量订货");
  279 + dataMap.put("continueSample", "□继续试样");
  280 + dataMap.put("stopSample", "□停止再试样");
  281 + }
256 dataMap.put("customerReviewsFileName", data.getCustomerReviewsFileName() == null ? "" : data.getCustomerReviewsFileName()); 282 dataMap.put("customerReviewsFileName", data.getCustomerReviewsFileName() == null ? "" : data.getCustomerReviewsFileName());
257 dataMap.put("officeSupervisorOpinion", data.getOfficeSupervisorOpinion() == null ? "" : data.getOfficeSupervisorOpinion()); 283 dataMap.put("officeSupervisorOpinion", data.getOfficeSupervisorOpinion() == null ? "" : data.getOfficeSupervisorOpinion());
258 dataMap.put("qualitySupervisorOpinion", data.getQualitySupervisorOpinion() == null ? "" : data.getQualitySupervisorOpinion()); 284 dataMap.put("qualitySupervisorOpinion", data.getQualitySupervisorOpinion() == null ? "" : data.getQualitySupervisorOpinion());
@@ -112,29 +112,14 @@ public class SampleResultTracking extends BaseEntity implements BaseDto { @@ -112,29 +112,14 @@ public class SampleResultTracking extends BaseEntity implements BaseDto {
112 private String other; 112 private String other;
113 113
114 /** 114 /**
115 - * 试样成功 115 + * 试样结果
116 */ 116 */
117 - private boolean sampleSuccess; 117 + private String sampleResult;
118 118
119 /** 119 /**
120 - * 批量订货 120 + * 试样结果子结果
121 */ 121 */
122 - private boolean bulkOrder;  
123 -  
124 - /**  
125 - * 试样不成功  
126 - */  
127 - private boolean sampleFailure;  
128 -  
129 - /**  
130 - * 继续试样  
131 - */  
132 - private boolean continueSample;  
133 -  
134 - /**  
135 - * 停止再试样  
136 - */  
137 - private boolean stopSample; 122 + private String sampleResultSub;
138 123
139 /** 124 /**
140 * 客户评价依据文件ID 125 * 客户评价依据文件ID
@@ -9,7 +9,6 @@ import com.lframework.starter.bpm.service.FlowInstanceWrapperService; @@ -9,7 +9,6 @@ import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
9 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo; 9 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
10 import com.lframework.starter.common.utils.CollectionUtil; 10 import com.lframework.starter.common.utils.CollectionUtil;
11 import com.lframework.starter.web.core.components.security.SecurityUtil; 11 import com.lframework.starter.web.core.components.security.SecurityUtil;
12 -import com.lframework.xingyun.sc.entity.ProductSampleConfirmationSlip;  
13 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail; 12 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
14 import com.lframework.xingyun.sc.entity.SampleResultTracking; 13 import com.lframework.xingyun.sc.entity.SampleResultTracking;
15 import com.lframework.starter.web.core.impl.BaseMpServiceImpl; 14 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -130,11 +129,8 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes @@ -130,11 +129,8 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes
130 .set(SampleResultTracking::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging()) 129 .set(SampleResultTracking::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
131 .set(SampleResultTracking::getWeight, StringUtil.isBlank(vo.getWeight()) ? null : vo.getWeight()) 130 .set(SampleResultTracking::getWeight, StringUtil.isBlank(vo.getWeight()) ? null : vo.getWeight())
132 .set(SampleResultTracking::getOther, StringUtil.isBlank(vo.getOther()) ? null : vo.getOther()) 131 .set(SampleResultTracking::getOther, StringUtil.isBlank(vo.getOther()) ? null : vo.getOther())
133 - .set(SampleResultTracking::isSampleSuccess, vo.isSampleSuccess())  
134 - .set(SampleResultTracking::isBulkOrder, vo.isBulkOrder())  
135 - .set(SampleResultTracking::isSampleFailure, vo.isSampleFailure())  
136 - .set(SampleResultTracking::isContinueSample, vo.isContinueSample())  
137 - .set(SampleResultTracking::isStopSample, vo.isStopSample()) 132 + .set(SampleResultTracking::getSampleResult, StringUtil.isBlank(vo.getSampleResult()) ? null : vo.getSampleResult())
  133 + .set(SampleResultTracking::getSampleResultSub, StringUtil.isBlank(vo.getSampleResultSub()) ? null : vo.getSampleResultSub())
138 .set(SampleResultTracking::getCustomerReviewsFileId, StringUtil.isBlank(vo.getCustomerReviewsFileId()) ? null : vo.getCustomerReviewsFileId()) 134 .set(SampleResultTracking::getCustomerReviewsFileId, StringUtil.isBlank(vo.getCustomerReviewsFileId()) ? null : vo.getCustomerReviewsFileId())
139 .set(SampleResultTracking::getCustomerReviewsFileName, StringUtil.isBlank(vo.getCustomerReviewsFileName()) ? null : vo.getCustomerReviewsFileName()) 135 .set(SampleResultTracking::getCustomerReviewsFileName, StringUtil.isBlank(vo.getCustomerReviewsFileName()) ? null : vo.getCustomerReviewsFileName())
140 .set(SampleResultTracking::getStatus, "AUDIT") 136 .set(SampleResultTracking::getStatus, "AUDIT")
@@ -63,39 +63,16 @@ public class UpdateSampleResultTrackingVo implements BaseVo, Serializable { @@ -63,39 +63,16 @@ public class UpdateSampleResultTrackingVo implements BaseVo, Serializable {
63 private String other; 63 private String other;
64 64
65 /** 65 /**
66 - * 试样成功 66 + * 试样结果
67 */ 67 */
68 - @ApiModelProperty("试样成功")  
69 - @TypeMismatch(message = "试样成功格式有误！")  
70 - private boolean sampleSuccess; 68 + @ApiModelProperty("试样结果")
  69 + private String sampleResult;
71 70
72 /** 71 /**
73 - * 批量订货 72 + * 试样结果子结果
74 */ 73 */
75 - @ApiModelProperty("批量订货")  
76 - @TypeMismatch(message = "批量订货格式有误！")  
77 - private boolean bulkOrder;  
78 -  
79 - /**  
80 - * 试样不成功  
81 - */  
82 - @ApiModelProperty("试样不成功")  
83 - @TypeMismatch(message = "试样不成功格式有误！")  
84 - private boolean sampleFailure;  
85 -  
86 - /**  
87 - * 继续试样  
88 - */  
89 - @ApiModelProperty("继续试样")  
90 - @TypeMismatch(message = "继续试样格式有误！")  
91 - private boolean continueSample;  
92 -  
93 - /**  
94 - * 停止再试样  
95 - */  
96 - @ApiModelProperty("停止再试样")  
97 - @TypeMismatch(message = "停止再试样格式有误！")  
98 - private boolean stopSample; 74 + @ApiModelProperty("试样结果子结果")
  75 + private String sampleResultSub;
99 76
100 /** 77 /**
101 * 客户评价依据文件ID 78 * 客户评价依据文件ID
@@ -20,11 +20,8 @@ @@ -20,11 +20,8 @@
20 <result column="packaging" property="packaging"/> 20 <result column="packaging" property="packaging"/>
21 <result column="weight" property="weight"/> 21 <result column="weight" property="weight"/>
22 <result column="other" property="other"/> 22 <result column="other" property="other"/>
23 - <result column="sample_success" property="sampleSuccess"/>  
24 - <result column="bulk_order" property="bulkOrder"/>  
25 - <result column="sample_failure" property="sampleFailure"/>  
26 - <result column="continue_sample" property="continueSample"/>  
27 - <result column="stop_sample" property="stopSample"/> 23 + <result column="sample_result" property="sampleResult"/>
  24 + <result column="sample_result_sub" property="sampleResultSub"/>
28 <result column="customer_reviews_file_id" property="customerReviewsFileId"/> 25 <result column="customer_reviews_file_id" property="customerReviewsFileId"/>
29 <result column="customer_reviews_file_name" property="customerReviewsFileName"/> 26 <result column="customer_reviews_file_name" property="customerReviewsFileName"/>
30 <result column="status" property="status"/> 27 <result column="status" property="status"/>
@@ -58,11 +55,8 @@ @@ -58,11 +55,8 @@
58 tb.packaging, 55 tb.packaging,
59 tb.weight, 56 tb.weight,
60 tb.other, 57 tb.other,
61 - tb.sample_success,  
62 - tb.bulk_order,  
63 - tb.sample_failure,  
64 - tb.continue_sample,  
65 - tb.stop_sample, 58 + tb.sample_result,
  59 + tb.sample_result_sub,
66 tb.customer_reviews_file_id, 60 tb.customer_reviews_file_id,
67 tb.customer_reviews_file_name, 61 tb.customer_reviews_file_name,
68 tb.status, 62 tb.status,