canrd-outside / order-erp · Commits

Commit e13bd966c6e20b242e761d3fa24d00d611948857

Authored by 谢茂盛
1 parent 3164be45
build: skipped

fix: 利润率计算公式修复/导出勾选项修复

Inline Side-by-side
Showing 4 changed files with 114 additions and 57 deletions
src/main/java/com/order/erp/domain/OrderLockFieldEnum.java
  View file @e13bd96
... ... @@ -16,6 +16,8 @@ public enum OrderLockFieldEnum {
16 16 LOCKED("LOCKED", "锁定"),
17 17  
18 18 UN_LOCKED("UN_LOCKED", "解锁"),
  19 +
  20 + SELECTED("selected", "勾选"),
19 21 ;
20 22 private String status;
21 23  
... ...
src/main/java/com/order/erp/domain/vo/OrderProfitAnalysisVo.java
  View file @e13bd96
... ... @@ -28,7 +28,7 @@ public class OrderProfitAnalysisVo implements Serializable {
28 28 /**
29 29 * 默认 0 公式1，1 公式2
30 30 */
31   - private int profitType;
  31 + private String profitType;
32 32  
33 33 /**
34 34 * 汇率
... ...
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @e13bd96
... ... @@ -250,61 +250,80 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
250 250 OrderTrackStageFieldVO trackStageFields = lockFieldVO.getTrackStageFields();
251 251 OrderInspectionStageFieldVO inspectionStageFields = lockFieldVO.getInspectionStageFields();
252 252 if (Objects.nonNull(baseFields)) {
253   - if (StringUtils.isNotBlank(baseFields.getCustomerCode())) {
  253 + if (StringUtils.isNotBlank(baseFields.getCustomerCode()) &&
  254 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCustomerCode())) {
254 255 map.put("客户编码", orderInfoResultVO.getCustomerCode());
255 256 }
256   - if (StringUtils.isNotBlank(baseFields.getProjectNo())) {
257   - map.put("项目号", orderInfoResultVO.getCustomerCode());
  257 + if (StringUtils.isNotBlank(baseFields.getProjectNo()) &&
  258 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProjectNo())) {
  259 + map.put("项目号", orderInfoResultVO.getProjectNo());
258 260 }
259   - if (StringUtils.isNotBlank(baseFields.getProductionDepartment())) {
  261 + if (StringUtils.isNotBlank(baseFields.getProductionDepartment()) &&
  262 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartment())) {
260 263 map.put("生产科", orderInfoResultVO.getProductionDepartment());
261 264 }
262   - if (StringUtils.isNotBlank(baseFields.getInnerNo())) {
  265 + if (StringUtils.isNotBlank(baseFields.getInnerNo()) &&
  266 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getInnerNo())) {
263 267 map.put("内部编号", orderInfoResultVO.getInnerNo());
264 268 }
265   - if (StringUtils.isNotBlank(baseFields.getCustomerPo())) {
  269 + if (StringUtils.isNotBlank(baseFields.getCustomerPo()) &&
  270 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCustomerPo())) {
266 271 map.put("客户po号", orderInfoResultVO.getCustomerPo());
267 272 }
268   - if (StringUtils.isNotBlank(baseFields.getCustomerStyle())) {
  273 + if (StringUtils.isNotBlank(baseFields.getCustomerStyle()) &&
  274 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCustomerStyle())) {
269 275 map.put("客户STYLE#", orderInfoResultVO.getCustomerStyle());
270 276 }
271   - if (StringUtils.isNotBlank(baseFields.getModeleLo())) {
  277 + if (StringUtils.isNotBlank(baseFields.getModeleLo()) &&
  278 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getModeleLo())) {
272 279 map.put("Modelo(REFERENCE)", orderInfoResultVO.getModeleLo());
273 280 }
274   - if (StringUtils.isNotBlank(baseFields.getCollection())) {
  281 + if (StringUtils.isNotBlank(baseFields.getCollection()) &&
  282 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCollection())) {
275 283 map.put("COLLECTION (style description)", orderInfoResultVO.getCollection());
276 284 }
277   - if (StringUtils.isNotBlank(baseFields.getPoColor())) {
  285 + if (StringUtils.isNotBlank(baseFields.getPoColor()) &&
  286 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPoColor())) {
278 287 map.put("PO COLOR", orderInfoResultVO.getPoColor());
279 288 }
280   - if (StringUtils.isNotBlank(baseFields.getCnColor())) {
  289 + if (StringUtils.isNotBlank(baseFields.getCnColor()) &&
  290 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCnColor())) {
281 291 map.put("颜色中文", orderInfoResultVO.getCnColor());
282 292 }
283   - if (StringUtils.isNotBlank(baseFields.getProductionComment())) {
  293 + if (StringUtils.isNotBlank(baseFields.getProductionComment()) &&
  294 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionComment())) {
284 295 map.put("生产要求", orderInfoResultVO.getProductionComment());
285 296 }
286   - if (StringUtils.isNotBlank(baseFields.getOrderCount())) {
  297 + if (StringUtils.isNotBlank(baseFields.getOrderCount()) &&
  298 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderCount())) {
287 299 map.put("数量", orderInfoResultVO.getOrderCount());
288 300 }
289   - if (StringUtils.isNotBlank(baseFields.getOrderComposition())) {
  301 + if (StringUtils.isNotBlank(baseFields.getOrderComposition()) &&
  302 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderComposition())) {
290 303 map.put("订单成分", orderInfoResultVO.getOrderComposition());
291 304 }
292   - if (StringUtils.isNotBlank(baseFields.getProductStyle())) {
  305 + if (StringUtils.isNotBlank(baseFields.getProductStyle()) &&
  306 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductStyle())) {
293 307 map.put("款式类型", orderInfoResultVO.getProductStyle());
294 308 }
295   - if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime())) {
  309 + if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime()) &&
  310 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartmentConsignTime())) {
296 311 map.put("生成科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
297 312 }
298   - if (StringUtils.isNotBlank(baseFields.getOrderHodTime())) {
  313 + if (StringUtils.isNotBlank(baseFields.getOrderHodTime()) &&
  314 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderHodTime())) {
299 315 map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
300 316 }
301   - if (StringUtils.isNotBlank(baseFields.getOutboundType())) {
  317 + if (StringUtils.isNotBlank(baseFields.getOutboundType()) &&
  318 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOutboundType())) {
302 319 map.put("出库类型", orderInfoResultVO.getOutboundType());
303 320 }
304   - if (StringUtils.isNotBlank(baseFields.getPacketType())) {
  321 + if (StringUtils.isNotBlank(baseFields.getPacketType()) &&
  322 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPacketType())) {
305 323 map.put("包装类型", orderInfoResultVO.getPacketType());
306 324 }
307   - if (StringUtils.isNotBlank(baseFields.getPicUrl())) {
  325 + if (StringUtils.isNotBlank(baseFields.getPicUrl()) &&
  326 + OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPicUrl())) {
308 327 if (StringUtils.isNotBlank(orderInfoResultVO.getSmallPicUrl())) {
309 328 URL url = new URL(orderInfoResultVO.getSmallPicUrl());
310 329 InputStream inputStream = url.openStream();
... ... @@ -317,121 +336,156 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
317 336 OrderProfitAnalysisVO profitAnalysisVO = Objects.nonNull(orderInfoResultVO.getProfitAnalysisInfo()) ?
318 337 orderInfoResultVO.getProfitAnalysisInfo() : new OrderProfitAnalysisVO();
319 338 if (Objects.nonNull(profitAnalysisFields)) {
320   - if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerPrice())) {
  339 + if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerPrice()) &&
  340 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getCustomerPrice())) {
321 341 map.put("客户单价$", profitAnalysisVO.getCustomerPrice());
322 342 }
323   - if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerTotalPrice())) {
  343 + if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerTotalPrice()) &&
  344 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getCustomerTotalPrice())) {
324 345 map.put("客户总价$", profitAnalysisVO.getCustomerTotalPrice());
325 346 }
326   - if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice())) {
  347 + if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice()) &&
  348 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentPrice())) {
327 349 map.put("生成科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
328 350 }
329   - if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentTotalPrice())) {
  351 + if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentTotalPrice()) &&
  352 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentTotalPrice())) {
330 353 map.put("生成科总价￥", profitAnalysisVO.getProductionDepartmentTotalPrice());
331 354 }
332   - if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice())) {
  355 + if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice()) &&
  356 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketPrice())) {
333 357 map.put("包装费用￥", profitAnalysisVO.getPacketPrice());
334 358 }
335   - if (StringUtils.isNotBlank(profitAnalysisFields.getPacketTotalPrice())) {
  359 + if (StringUtils.isNotBlank(profitAnalysisFields.getPacketTotalPrice()) &&
  360 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketTotalPrice())) {
336 361 map.put("包装费用合计￥", profitAnalysisVO.getPacketTotalPrice());
337 362 }
338   - if (StringUtils.isNotBlank(profitAnalysisFields.getExchangeRate())) {
  363 + if (StringUtils.isNotBlank(profitAnalysisFields.getExchangeRate()) &&
  364 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getExchangeRate())) {
339 365 map.put("汇率", profitAnalysisVO.getExchangeRate());
340 366 }
341   - if (StringUtils.isNotBlank(profitAnalysisFields.getProfitRate())) {
  367 + if (StringUtils.isNotBlank(profitAnalysisFields.getProfitRate()) &&
  368 + OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProfitRate())) {
342 369 map.put("利润率", profitAnalysisVO.getProfitRate());
343 370 }
344 371 }
345 372 OrderCompletionReportVO reportInfo = Objects.nonNull(orderInfoResultVO.getReportInfo()) ?
346 373 orderInfoResultVO.getReportInfo() : new OrderCompletionReportVO();
347 374 if (Objects.nonNull(reportFields) && Objects.nonNull(reportInfo)) {
348   - if (StringUtils.isNotBlank(reportFields.getIdeaSource())) {
  375 + if (StringUtils.isNotBlank(reportFields.getIdeaSource()) &&
  376 + OrderLockFieldEnum.SELECTED.getStatus().equals(reportFields.getIdeaSource())) {
349 377 map.put("想法来源", reportInfo.getIdeaSource());
350 378 }
351   - if (StringUtils.isNotBlank(reportFields.getManualPreform())) {
  379 + if (StringUtils.isNotBlank(reportFields.getManualPreform()) &&
  380 + OrderLockFieldEnum.SELECTED.getStatus().equals(reportFields.getManualPreform())) {
352 381 map.put("手工初型", reportInfo.getManualPreform());
353 382 }
354   - if (StringUtils.isNotBlank(reportFields.getIdeaManualRate())) {
  383 + if (StringUtils.isNotBlank(reportFields.getIdeaManualRate()) &&
  384 + OrderLockFieldEnum.SELECTED.getStatus().equals(reportFields.getIdeaManualRate())) {
355 385 map.put("想法和手工比例分配", reportInfo.getIdeaManualRate());
356 386 }
357 387 }
358 388 OrderTrackStageVO trackStageInfo = Objects.nonNull(orderInfoResultVO.getTrackStageInfo()) ?
359 389 orderInfoResultVO.getTrackStageInfo() : new OrderTrackStageVO();
360 390 if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
361   - if (StringUtils.isNotBlank(trackStageFields.getPpTime())) {
  391 + if (StringUtils.isNotBlank(trackStageFields.getPpTime()) &&
  392 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpTime())) {
362 393 map.put("pp date", trackStageInfo.getPpTime());
363 394 }
364   - if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult())) {
  395 + if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult()) &&
  396 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpConfirmResult())) {
365 397 map.put("pp样品确认意见", trackStageInfo.getPpConfirmResult());
366 398 }
367   - if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime())) {
  399 + if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime()) &&
  400 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getEsoSampleSendTime())) {
368 401 map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
369 402 }
370   - if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime())) {
  403 + if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime()) &&
  404 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleSendTime())) {
371 405 map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
372 406 }
373   - if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult())) {
  407 + if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult()) &&
  408 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleConfirmResult())) {
374 409 map.put("shipment sample确认意见", trackStageInfo.getShippmentSampleConfirmResult());
375 410 }
376   - if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime())) {
  411 + if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime()) &&
  412 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSelfTestPassTime())) {
377 413 map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
378 414 }
379   - if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime())) {
  415 + if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime()) &&
  416 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestSendTime())) {
380 417 map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
381 418 }
382   - if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime())) {
  419 + if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) &&
  420 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) {
383 421 map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
384 422 }
385   - if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult())) {
  423 + if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult()) &&
  424 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestFinishResult())) {
386 425 map.put("SGS测试结果", trackStageInfo.getSgsTestFinishResult());
387 426 }
388   - if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime())) {
  427 + if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime()) &&
  428 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getBarcodeStickerArrivalTime())) {
389 429 map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
390 430 }
391   - if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime())) {
  431 + if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime()) &&
  432 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestArrivalTime())) {
392 433 map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
393 434 }
394   - if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime())) {
  435 + if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime()) &&
  436 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestBkTime())) {
395 437 map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
396 438 }
397 439 }
398 440 OrderInspectionStageVO inspectionStageInfo = Objects.nonNull(orderInfoResultVO.getInspectionStageInfo()) ?
399 441 orderInfoResultVO.getInspectionStageInfo() : new OrderInspectionStageVO();
400 442 if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
401   - if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime())) {
  443 + if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime()) &&
  444 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckApplyTime())) {
402 445 map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
403 446 }
404   - if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment())) {
  447 + if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment()) &&
  448 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckComment())) {
405 449 map.put("中期验货（功能性-拉力/跌落等、外观性-颜色/规格等、耐久性-烤厅等）", inspectionStageInfo.getMidCheckComment());
406 450 }
407   - if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckResult())) {
  451 + if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckResult()) &&
  452 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckResult())) {
408 453 map.put("中期验货结果PASS / FAIL", inspectionStageInfo.getMidCheckResult());
409 454 }
410   - if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime())) {
  455 + if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime()) &&
  456 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckApplyTime())) {
411 457 map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
412 458 }
413   - if (StringUtils.isNotBlank(inspectionStageFields.getSpecification())) {
  459 + if (StringUtils.isNotBlank(inspectionStageFields.getSpecification()) &&
  460 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getSpecification())) {
414 461 map.put("长度/规格", inspectionStageInfo.getSpecification());
415 462 }
416   - if (StringUtils.isNotBlank(inspectionStageFields.getFunctionality())) {
  463 + if (StringUtils.isNotBlank(inspectionStageFields.getFunctionality()) &&
  464 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getFunctionality())) {
417 465 map.put("功能性不良", inspectionStageInfo.getFunctionality());
418 466 }
419   - if (StringUtils.isNotBlank(inspectionStageFields.getElectroplate())) {
  467 + if (StringUtils.isNotBlank(inspectionStageFields.getElectroplate()) &&
  468 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getElectroplate())) {
420 469 map.put("电镀不良", inspectionStageInfo.getElectroplate());
421 470 }
422   - if (StringUtils.isNotBlank(inspectionStageFields.getValue1())) {
  471 + if (StringUtils.isNotBlank(inspectionStageFields.getValue1()) &&
  472 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getValue1())) {
423 473 map.put("不良1", inspectionStageInfo.getValue1());
424 474 }
425   - if (StringUtils.isNotBlank(inspectionStageFields.getValue2())) {
  475 + if (StringUtils.isNotBlank(inspectionStageFields.getValue2()) &&
  476 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getValue2())) {
426 477 map.put("不良2", inspectionStageInfo.getValue2());
427 478 }
428   - if (StringUtils.isNotBlank(inspectionStageFields.getValue3())) {
  479 + if (StringUtils.isNotBlank(inspectionStageFields.getValue3()) &&
  480 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getValue3())) {
429 481 map.put("不良3", inspectionStageInfo.getValue3());
430 482 }
431   - if (StringUtils.isNotBlank(inspectionStageFields.getBoxPacket())) {
  483 + if (StringUtils.isNotBlank(inspectionStageFields.getBoxPacket()) &&
  484 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getBoxPacket())) {
432 485 map.put("包装：卡片、条码、箱贴，箱单", inspectionStageInfo.getBoxPacket());
433 486 }
434   - if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckResult())) {
  487 + if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckResult()) &&
  488 + OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageInfo.getEndCheckResult())) {
435 489 map.put("尾期验货结果PASS / FAIL", inspectionStageInfo.getEndCheckResult());
436 490 }
437 491 }
... ...
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
  View file @e13bd96
... ... @@ -10,6 +10,7 @@ import com.order.erp.common.constant.Constant;
10 10 import com.order.erp.common.constant.ServerResult;
11 11 import com.order.erp.common.exception.BusinessException;
12 12 import com.order.erp.common.utils.ProfitUtils;
  13 +import com.order.erp.common.utils.StringUtils;
13 14 import com.order.erp.domain.dto.BaseDO;
14 15 import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
15 16 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
... ... @@ -178,7 +179,7 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl<OrderProfitAnaly
178 179 profitAnalysisVO.setCustomerTotalPrice(customerTotalPrice.doubleValue());
179 180 profitAnalysisVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue());
180 181 profitAnalysisVO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
181   - .profitType(profitAnalysisVo.getProfitType())
  182 + .profitType(StringUtils.isBlank(profitAnalysisVo.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisVO.getProfitType()))
182 183 .exchangeRate(profitAnalysisVo.getExchangeRate())
183 184 .productionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue())
184 185 .packetTotalPrice(packetTotalPrice.doubleValue())
... ...