canrd-outside / order-erp · Commits

Commit 4f0c10d9f8db97b39c2f416f1d6962bb8fd84f0e

Authored by qdlgxiemaosheng
1 parent 66c8eac7
build: skipped

fixbug

Inline Side-by-side
Showing 1 changed file with 79 additions and 2 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @4f0c10d
@@ -1010,12 +1010,52 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -1010,12 +1010,52 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1010 OrderTrackStageDO trackStageDO = trackStageService.getOne(new LambdaQueryWrapper<OrderTrackStageDO>() 1010 OrderTrackStageDO trackStageDO = trackStageService.getOne(new LambdaQueryWrapper<OrderTrackStageDO>()
1011 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 1011 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1012 .eq(OrderTrackStageDO::getOrderId, updateVO.getOrderId())); 1012 .eq(OrderTrackStageDO::getOrderId, updateVO.getOrderId()));
  1013 + OrderTrackStageVO trackStageInfo = updateVO.getTrackStageInfo();
1013 if (Objects.nonNull(trackStageDO)) { 1014 if (Objects.nonNull(trackStageDO)) {
1014 - BeanUtils.copyProperties(updateVO.getTrackStageInfo(), trackStageDO); 1015 + if (StringUtils.isNotBlank(trackStageInfo.getPpTime())) {
  1016 + trackStageDO.setPpTime(trackStageInfo.getPpTime());
  1017 + }
  1018 + if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
  1019 + trackStageDO.setPpConfirmResult(trackStageInfo.getPpConfirmResult());
  1020 + }
  1021 + if (StringUtils.isNotBlank(trackStageInfo.getEsoSampleSendTime())) {
  1022 + trackStageDO.setEsoSampleSendTime(trackStageInfo.getEsoSampleSendTime());
  1023 + }
  1024 + if (StringUtils.isNotBlank(trackStageInfo.getShippmentSampleSendTime())) {
  1025 + trackStageDO.setShippmentSampleSendTime(trackStageInfo.getShippmentSampleSendTime());
  1026 + }
  1027 + if (StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
  1028 + trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
  1029 + }
  1030 + if (StringUtils.isNotBlank(trackStageInfo.getSelfTestPassTime())) {
  1031 + trackStageDO.setSelfTestPassTime(trackStageInfo.getSelfTestPassTime());
  1032 + }
  1033 + if (StringUtils.isNotBlank(trackStageInfo.getAitexTestSendTime())) {
  1034 + trackStageDO.setAitexTestSendTime(trackStageInfo.getAitexTestSendTime());
  1035 + }
  1036 + if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
  1037 + trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
  1038 + }
  1039 + if (StringUtils.isNotBlank(trackStageInfo.getSgsTestSendTime())) {
  1040 + trackStageDO.setSgsTestSendTime(trackStageInfo.getSgsTestSendTime());
  1041 + }
  1042 + if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
  1043 + trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
  1044 + }
  1045 + if (StringUtils.isNotBlank(trackStageInfo.getBarcodeStickerArrivalTime())) {
  1046 + trackStageDO.setBarcodeStickerArrivalTime(trackStageInfo.getBarcodeStickerArrivalTime());
  1047 + }
  1048 + if (StringUtils.isNotBlank(trackStageInfo.getLatestArrivalTime())) {
  1049 + trackStageDO.setLatestArrivalTime(trackStageInfo.getLatestArrivalTime());
  1050 + }
  1051 + if (StringUtils.isNotBlank(trackStageInfo.getLatestBkTime())) {
  1052 + trackStageDO.setLatestBkTime(trackStageInfo.getLatestBkTime());
  1053 + }
1015 trackStageDO.setOrderId(updateVO.getOrderId()); 1054 trackStageDO.setOrderId(updateVO.getOrderId());
1016 trackStageDO.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus()); 1055 trackStageDO.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
1017 trackStageService.updateById(trackStageDO); 1056 trackStageService.updateById(trackStageDO);
1018 } else { 1057 } else {
  1058 + trackStageDO = new OrderTrackStageDO();
1019 BeanUtils.copyProperties(updateVO.getTrackStageInfo(), trackStageDO); 1059 BeanUtils.copyProperties(updateVO.getTrackStageInfo(), trackStageDO);
1020 trackStageDO.setOrderId(updateVO.getOrderId()); 1060 trackStageDO.setOrderId(updateVO.getOrderId());
1021 trackStageDO.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus()); 1061 trackStageDO.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
@@ -1028,12 +1068,49 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -1028,12 +1068,49 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
1028 OrderInspectionStageDO inspectionStageDO = inspectionStageService.getOne(new LambdaQueryWrapper<OrderInspectionStageDO>() 1068 OrderInspectionStageDO inspectionStageDO = inspectionStageService.getOne(new LambdaQueryWrapper<OrderInspectionStageDO>()
1029 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 1069 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1030 .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId())); 1070 .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId()));
  1071 + OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo();
1031 if (Objects.nonNull(inspectionStageDO)) { 1072 if (Objects.nonNull(inspectionStageDO)) {
1032 - BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO); 1073 + if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) {
  1074 + inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime());
  1075 + }
  1076 + if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckComment())) {
  1077 + inspectionStageDO.setMidCheckComment(inspectionStageInfo.getMidCheckComment());
  1078 + }
  1079 + if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckResult())) {
  1080 + inspectionStageDO.setMidCheckResult(inspectionStageInfo.getMidCheckResult());
  1081 + }
  1082 + if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
  1083 + inspectionStageDO.setEndCheckApplyTime(inspectionStageInfo.getEndCheckApplyTime());
  1084 + }
  1085 + if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckResult())) {
  1086 + inspectionStageDO.setEndCheckResult(inspectionStageInfo.getEndCheckResult());
  1087 + }
  1088 + if (StringUtils.isNotBlank(inspectionStageInfo.getSpecification())) {
  1089 + inspectionStageDO.setSpecification(inspectionStageInfo.getSpecification());
  1090 + }
  1091 + if (StringUtils.isNotBlank(inspectionStageInfo.getFunctionality())) {
  1092 + inspectionStageDO.setFunctionality(inspectionStageInfo.getFunctionality());
  1093 + }
  1094 + if (StringUtils.isNotBlank(inspectionStageInfo.getElectroplate())) {
  1095 + inspectionStageDO.setElectroplate(inspectionStageInfo.getElectroplate());
  1096 + }
  1097 + if (StringUtils.isNotBlank(inspectionStageInfo.getValue1())) {
  1098 + inspectionStageDO.setValue1(inspectionStageInfo.getValue1());
  1099 + }
  1100 + if (StringUtils.isNotBlank(inspectionStageInfo.getValue2())) {
  1101 + inspectionStageDO.setValue2(inspectionStageInfo.getValue2());
  1102 + }
  1103 + if (StringUtils.isNotBlank(inspectionStageInfo.getValue3())) {
  1104 + inspectionStageDO.setValue3(inspectionStageInfo.getValue3());
  1105 + }
  1106 + if (StringUtils.isNotBlank(inspectionStageInfo.getBoxPacket())) {
  1107 + inspectionStageDO.setBoxPacket(inspectionStageInfo.getBoxPacket());
  1108 + }
1033 inspectionStageDO.setOrderId(updateVO.getOrderId()); 1109 inspectionStageDO.setOrderId(updateVO.getOrderId());
1034 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus()); 1110 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
1035 inspectionStageService.updateById(inspectionStageDO); 1111 inspectionStageService.updateById(inspectionStageDO);
1036 } else { 1112 } else {
  1113 + inspectionStageDO = new OrderInspectionStageDO();
1037 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO); 1114 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
1038 inspectionStageDO.setOrderId(updateVO.getOrderId()); 1115 inspectionStageDO.setOrderId(updateVO.getOrderId());
1039 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus()); 1116 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());