Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -751,8 +751,8 @@ public class SpsSyncDownloadController {
                     }
                 } else {
 //                    更新业务详情
-                    if (orderEntity.getCheckStatus() != null)
+//                    if (orderEntity.getCheckStatus() != null)
-                        orderService.update(orderEntity);
+//                        orderService.update(orderEntity);
                     //更新业务详情
                     if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) {
                         List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -585,7 +585,13 @@ public class IoOrderServiceImpl implements IoOrderService {
                 IoOrderResponse response = new IoOrderResponse();
                 BeanUtil.copyProperties(orderEntity, response);
                 if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_AUDITED) && checkBusTypeSupplementOrder(orderEntity)
-                        && StrUtil.isEmpty(orderEntity.getSupplementNo())) {
+                        && StrUtil.isEmpty(orderEntity.getSupplementNo())
+                ) {
+                    if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
+                        if (orderEntity.getOutChangeEnable()) {
+                            response.setEnableSupplementOrder(true);
+                        }
+                    } else
                         response.setEnableSupplementOrder(true);
                 }
                 result.add(response);