canrd-outside / order-erp · Commits

Commit 0b985a1ac4349c26af8d7227ac37063d7475b9c9

Authored by qdlgxiemaosheng
1 parent a7d0e78c
build: skipped

fixbug

Inline Side-by-side
Showing 2 changed files with 99 additions and 34 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @0b985a1
@@ -892,9 +892,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -892,9 +892,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
892 throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY); 892 throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
893 } 893 }
894 if (Objects.nonNull(updateVO.getBaseInfo())) { 894 if (Objects.nonNull(updateVO.getBaseInfo())) {
895 - orderBaseInfoDo = BeanUtil.copyProperties(updateVO.getBaseInfo(), OrderBaseInfoDO.class); 895 + buildUpdateVO(updateVO.getBaseInfo(), orderBaseInfoDo);
896 orderBaseInfoDo.setId(updateVO.getOrderId()); 896 orderBaseInfoDo.setId(updateVO.getOrderId());
897 -  
898 } 897 }
899 if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) { 898 if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
900 checkApply(updateVO.getOrderId(), userId); 899 checkApply(updateVO.getOrderId(), userId);
@@ -902,7 +901,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -902,7 +901,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
902 orderFieldLockApplyService.save(orderFieldLockApplyDO); 901 orderFieldLockApplyService.save(orderFieldLockApplyDO);
903 902
904 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus()); 903 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
905 - updateById(orderBaseInfoDo);  
906 orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields())); 904 orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_PROFIT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields()));
907 } 905 }
908 906
@@ -912,7 +910,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -912,7 +910,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
912 orderFieldLockApplyService.save(orderFieldLockApplyDO); 910 orderFieldLockApplyService.save(orderFieldLockApplyDO);
913 911
914 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus()); 912 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
915 - updateById(orderBaseInfoDo);  
916 orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields())); 913 orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_REPORT_EDIT_APPLY.getDesc(), orderFieldLockApplyDO.getFields()));
917 } 914 }
918 915
@@ -932,7 +929,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -932,7 +929,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
932 trackStageService.save(trackStageDO); 929 trackStageService.save(trackStageDO);
933 } 930 }
934 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus()); 931 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
935 - updateById(orderBaseInfoDo);  
936 } 932 }
937 933
938 if (Objects.nonNull(updateVO.getInspectionStageInfo())) { 934 if (Objects.nonNull(updateVO.getInspectionStageInfo())) {
@@ -951,14 +947,83 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -951,14 +947,83 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
951 inspectionStageService.save(inspectionStageDO); 947 inspectionStageService.save(inspectionStageDO);
952 } 948 }
953 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus()); 949 orderBaseInfoDo.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
954 - updateById(orderBaseInfoDo);  
955 } 950 }
956 - 951 + updateById(orderBaseInfoDo);
957 orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO))); 952 orderOptLogService.save(buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO)));
958 return ServerResult.success(); 953 return ServerResult.success();
959 } 954 }
960 955
961 /** 956 /**
  957 + * @param baseInfoVO
  958 + * @param baseInfoDO
  959 + */
  960 + private void buildUpdateVO(OrderBaseInfoVO baseInfoVO, OrderBaseInfoDO baseInfoDO) {
  961 + if (Objects.isNull(baseInfoVO)) {
  962 + return;
  963 + }
  964 + if (StringUtils.isNotBlank(baseInfoVO.getCustomerCode())) {
  965 + baseInfoDO.setCustomerCode(baseInfoVO.getCustomerCode());
  966 + }
  967 + if (StringUtils.isNotBlank(baseInfoVO.getProjectNo())) {
  968 + baseInfoDO.setProjectNo(baseInfoVO.getProjectNo());
  969 + }
  970 + if (StringUtils.isNotBlank(baseInfoVO.getProductionDepartment())) {
  971 + baseInfoDO.setProductionComment(baseInfoVO.getProductionDepartment());
  972 + }
  973 + if (StringUtils.isNotBlank(baseInfoVO.getInnerNo())) {
  974 + baseInfoDO.setInnerNo(baseInfoVO.getInnerNo());
  975 + }
  976 + if (StringUtils.isNotBlank(baseInfoVO.getCustomerPo())) {
  977 + baseInfoDO.setCustomerPo(baseInfoVO.getCustomerPo());
  978 + }
  979 + if (StringUtils.isNotBlank(baseInfoVO.getCustomerStyle())) {
  980 + baseInfoDO.setCustomerStyle(baseInfoVO.getCustomerStyle());
  981 + }
  982 + if (StringUtils.isNotBlank(baseInfoVO.getModeleLo())) {
  983 + baseInfoDO.setModeleLo(baseInfoVO.getModeleLo());
  984 + }
  985 + if (StringUtils.isNotBlank(baseInfoVO.getCollection())) {
  986 + baseInfoDO.setCollection(baseInfoVO.getCollection());
  987 + }
  988 + if (StringUtils.isNotBlank(baseInfoVO.getPoColor())) {
  989 + baseInfoDO.setPoColor(baseInfoVO.getPoColor());
  990 + }
  991 + if (StringUtils.isNotBlank(baseInfoVO.getCnColor())) {
  992 + baseInfoDO.setCnColor(baseInfoVO.getCnColor());
  993 + }
  994 + if (StringUtils.isNotBlank(baseInfoVO.getPicUrl())) {
  995 + baseInfoDO.setPicUrl(baseInfoVO.getPicUrl());
  996 + }
  997 + if (StringUtils.isNotBlank(baseInfoVO.getSmallPicUrl())) {
  998 + baseInfoDO.setSmallPicUrl(baseInfoVO.getSmallPicUrl());
  999 + }
  1000 + if (StringUtils.isNotBlank(baseInfoVO.getProductionComment())) {
  1001 + baseInfoDO.setProductionComment(baseInfoVO.getProductionComment());
  1002 + }
  1003 + if (Objects.nonNull(baseInfoVO.getOrderCount())) {
  1004 + baseInfoDO.setOrderCount(baseInfoVO.getOrderCount());
  1005 + }
  1006 + if (StringUtils.isNotBlank(baseInfoVO.getOrderComposition())) {
  1007 + baseInfoDO.setOrderComposition(baseInfoVO.getOrderComposition());
  1008 + }
  1009 + if (StringUtils.isNotBlank(baseInfoVO.getProductStyle())) {
  1010 + baseInfoDO.setProductStyle(baseInfoVO.getProductStyle());
  1011 + }
  1012 + if (StringUtils.isNotBlank(baseInfoVO.getProductionDepartmentConsignTime())) {
  1013 + baseInfoDO.setProductionDepartmentConsignTime(baseInfoVO.getProductionDepartmentConsignTime());
  1014 + }
  1015 + if (StringUtils.isNotBlank(baseInfoVO.getOrderHodTime())) {
  1016 + baseInfoDO.setOrderHodTime(baseInfoVO.getOrderHodTime());
  1017 + }
  1018 + if (StringUtils.isNotBlank(baseInfoVO.getOutboundType())) {
  1019 + baseInfoDO.setOutboundType(baseInfoVO.getOutboundType());
  1020 + }
  1021 + if (StringUtils.isNotBlank(baseInfoVO.getPacketType())) {
  1022 + baseInfoDO.setPacketType(baseInfoVO.getPacketType());
  1023 + }
  1024 + }
  1025 +
  1026 + /**
962 * 通过主键删除数据 1027 * 通过主键删除数据
963 * 1028 *
964 * @param orderBaseInfoQueryVO 筛选条件 1029 * @param orderBaseInfoQueryVO 筛选条件
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @0b985a1
@@ -155,33 +155,33 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp @@ -155,33 +155,33 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp
155 fillOrderBaseInfo(resultVOList, orderBaseInfoDOList); 155 fillOrderBaseInfo(resultVOList, orderBaseInfoDOList);
156 } 156 }
157 157
158 - List<OrderCompletionReportDO> reportDOList = reportService.list(new LambdaQueryWrapper<OrderCompletionReportDO>()  
159 - .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderCompletionReportDO::getOrderId, orderIds));  
160 -  
161 - if (CollectionUtils.isNotEmpty(reportDOList)) {  
162 - fillOrderReportInfo(resultVOList, reportDOList);  
163 - }  
164 -  
165 - List<OrderProfitAnalysisDO> profitAnalysisDOList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()  
166 - .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderProfitAnalysisDO::getOrderId, orderIds));  
167 -  
168 - if (CollectionUtils.isNotEmpty(profitAnalysisDOList)) {  
169 - fillOrderProfitInfo(resultVOList, profitAnalysisDOList);  
170 - }  
171 -  
172 - List<OrderTrackStageDO> trackStageDOList = trackStageService.list(new LambdaQueryWrapper<OrderTrackStageDO>()  
173 - .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderTrackStageDO::getOrderId, orderIds));  
174 -  
175 - if (CollectionUtils.isNotEmpty(trackStageDOList)) {  
176 - fillOrderTrackerInfo(resultVOList, trackStageDOList);  
177 - }  
178 -  
179 - List<OrderInspectionStageDO> inspectionStageDOList = inspectionStageService.list(new LambdaQueryWrapper<OrderInspectionStageDO>()  
180 - .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderInspectionStageDO::getOrderId, orderIds));  
181 -  
182 - if (CollectionUtils.isNotEmpty(inspectionStageDOList)) {  
183 - fillOrderInspectInfo(resultVOList, inspectionStageDOList);  
184 - } 158 +// List<OrderCompletionReportDO> reportDOList = reportService.list(new LambdaQueryWrapper<OrderCompletionReportDO>()
  159 +// .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderCompletionReportDO::getOrderId, orderIds));
  160 +//
  161 +// if (CollectionUtils.isNotEmpty(reportDOList)) {
  162 +// fillOrderReportInfo(resultVOList, reportDOList);
  163 +// }
  164 +//
  165 +// List<OrderProfitAnalysisDO> profitAnalysisDOList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
  166 +// .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderProfitAnalysisDO::getOrderId, orderIds));
  167 +//
  168 +// if (CollectionUtils.isNotEmpty(profitAnalysisDOList)) {
  169 +// fillOrderProfitInfo(resultVOList, profitAnalysisDOList);
  170 +// }
  171 +//
  172 +// List<OrderTrackStageDO> trackStageDOList = trackStageService.list(new LambdaQueryWrapper<OrderTrackStageDO>()
  173 +// .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderTrackStageDO::getOrderId, orderIds));
  174 +//
  175 +// if (CollectionUtils.isNotEmpty(trackStageDOList)) {
  176 +// fillOrderTrackerInfo(resultVOList, trackStageDOList);
  177 +// }
  178 +//
  179 +// List<OrderInspectionStageDO> inspectionStageDOList = inspectionStageService.list(new LambdaQueryWrapper<OrderInspectionStageDO>()
  180 +// .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderInspectionStageDO::getOrderId, orderIds));
  181 +//
  182 +// if (CollectionUtils.isNotEmpty(inspectionStageDOList)) {
  183 +// fillOrderInspectInfo(resultVOList, inspectionStageDOList);
  184 +// }
185 } 185 }
186 186
187 /** 187 /**